Update to 3.4-rc5.
authorJeff Mahoney <jeffm@suse.com>
Mon, 30 Apr 2012 02:09:51 +0000 (22:09 -0400)
committerJeff Mahoney <jeffm@suse.com>
Mon, 30 Apr 2012 02:09:51 +0000 (22:09 -0400)
suse-commit: e4e6b3376f2716eee03a501490d44ed613034846

1  2 
Makefile
arch/x86/kernel/cpu/amd.c
arch/x86/kernel/cpu/intel_cacheinfo.c
arch/x86/xen/enlighten.c
drivers/acpi/sleep.c
drivers/pci/Makefile
fs/ext4/super.c
fs/nfs/dir.c
init/main.c
kernel/sched/core.c
net/ipv6/addrconf.c

diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/ext4/super.c
Simple merge
diff --cc fs/nfs/dir.c
Simple merge
diff --cc init/main.c
Simple merge
Simple merge
Simple merge