- Updated to 3.2-rc7.
authorJeff Mahoney <jeffm@suse.com>
Mon, 2 Jan 2012 14:35:31 +0000 (09:35 -0500)
committerJeff Mahoney <jeffm@suse.com>
Mon, 2 Jan 2012 14:35:31 +0000 (09:35 -0500)
suse-commit: f458508d6d23f646c3a7c044ca8fabac49eeaeb8

13 files changed:
1  2 
Makefile
arch/x86/kernel/dumpstack_32.c
arch/x86/kernel/dumpstack_64.c
drivers/input/mouse/synaptics.c
drivers/oprofile/oprofile_files.c
drivers/pci/pci.c
drivers/xen/xenbus/xenbus_xs.c
include/xen/interface/io/xs_wire.h
kernel/sysctl_binary.c
mm/filemap.c
mm/vmalloc.c
net/sunrpc/sched.c
scripts/kconfig/Makefile

diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/filemap.c
Simple merge
diff --cc mm/vmalloc.c
Simple merge
Simple merge
Simple merge