]> git.karo-electronics.de Git - linux-beck.git/commit
Merge 3.3-rc2 into the driver-core-next branch.
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 2 Feb 2012 19:24:44 +0000 (11:24 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 2 Feb 2012 19:24:44 +0000 (11:24 -0800)
commitbd1d462e13b278fc57752d0b9b15040e60e561a0
treee2fdf1c18a93aab02830bcb8a5db8cdddfbb63a8
parentd5c38b137ac8a6e3dbed13bc494d60df5b69dfc4
parent62aa2b537c6f5957afd98e29f96897419ed5ebab
Merge 3.3-rc2 into the driver-core-next branch.

This was done to resolve a merge and build problem with the
drivers/acpi/processor_driver.c file.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/Kconfig
arch/x86/include/asm/cpufeature.h
drivers/acpi/processor_driver.c
drivers/base/bus.c
drivers/idle/intel_idle.c
fs/sysfs/inode.c
include/acpi/processor.h
include/linux/device.h
include/linux/mod_devicetable.h
scripts/mod/file2alias.c