]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bf17f95 cb0a614)
Merge branch 'driver-core-next' into Linux 3.2
authorGreg Kroah-Hartman <gregkh@suse.de>
Fri, 6 Jan 2012 19:42:52 +0000 (11:42 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 6 Jan 2012 19:42:52 +0000 (11:42 -0800)
commitd8ff98921679617cdaa934a8cef5213a6f131037
treed851c923f85566572112d4c0f884cff388a3cc05tree | snapshot
parentbf17f95934ad16844ebaeb69e55157d08f1294b9commit | diff
parentcb0a6144aa40911547e2694164eeee8f66eae74ccommit | diff
Merge branch 'driver-core-next' into Linux 3.2

This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
and it fixes the build error in the arch/x86/kernel/microcode_core.c
file, that the merge did not catch.

The microcode_core.c patch was provided by Stephen Rothwell
<sfr@canb.auug.org.au> who was invaluable in the merge issues involved
with the large sysdev removal process in the driver-core tree.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
31 files changed:
MAINTAINERS diff1 | diff2 | blob | history
arch/arm/mach-bcmring/core.c diff1 | diff2 | blob | history
arch/arm/mach-exynos/cpu.c diff1 | diff2 | blob | history
arch/arm/mach-s5pv210/mach-smdkv210.c diff1 | diff2 | blob | history
arch/powerpc/kernel/smp.c diff1 | diff2 | blob | history
arch/powerpc/mm/numa.c diff1 | diff2 | blob | history
arch/powerpc/platforms/cell/spu_base.c diff1 | diff2 | blob | history
arch/s390/kernel/topology.c diff1 | diff2 | blob | history
arch/tile/kernel/sysfs.c diff1 | diff2 | blob | history
arch/x86/include/asm/mce.h diff1 | diff2 | blob | history
arch/x86/kernel/cpu/mcheck/mce.c diff1 | diff2 | blob | history
arch/x86/kernel/hpet.c diff1 | diff2 | blob | history
arch/x86/kernel/microcode_core.c diff1 | diff2 | blob | history
drivers/base/core.c diff1 | diff2 | blob | history
drivers/base/node.c diff1 | diff2 | blob | history
drivers/bluetooth/btusb.c diff1 | diff2 | blob | history
drivers/leds/led-class.c diff1 | diff2 | blob | history
drivers/media/rc/ati_remote.c diff1 | diff2 | blob | history
drivers/net/bonding/bond_sysfs.c diff1 | diff2 | blob | history
drivers/net/usb/asix.c diff1 | diff2 | blob | history
drivers/net/usb/cdc_ether.c diff1 | diff2 | blob | history
drivers/net/usb/lg-vl600.c diff1 | diff2 | blob | history
drivers/net/usb/smsc75xx.c diff1 | diff2 | blob | history
drivers/net/wireless/rt2x00/rt2800usb.c diff1 | diff2 | blob | history
drivers/usb/storage/ene_ub6250.c diff1 | diff2 | blob | history
include/linux/device.h diff1 | diff2 | blob | history
include/linux/i2c.h diff1 | diff2 | blob | history
kernel/sched.c diff1 | diff2 | blob | history
kernel/time/clocksource.c diff1 | diff2 | blob | history
mm/hugetlb.c diff1 | diff2 | blob | history
mm/vmscan.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.