]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge tag 'v3.0.34' into uek2-2.6.39-300#14252075
authorGuangyu Sun <guangyu.sun@oracle.com>
Tue, 3 Jul 2012 21:33:43 +0000 (14:33 -0700)
committerGuangyu Sun <guangyu.sun@oracle.com>
Tue, 3 Jul 2012 21:33:43 +0000 (14:33 -0700)
This is the 3.0.34 stable release

Conflicts:
arch/x86/include/asm/pgtable-3level.h

Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>
1  2 
Makefile
fs/nfs/nfs4proc.c
include/linux/netdevice.h
include/linux/skbuff.h
net/core/dev.c

diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/core/dev.c
Simple merge