projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d5c38b1 62aa2b5)
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
treee2fdf1c18a93aab02830bcb8a5db8cdddfbb63a8tree | snapshot
parentd5c38b137ac8a6e3dbed13bc494d60df5b69dfc4commit | diff
parent62aa2b537c6f5957afd98e29f96897419ed5ebabcommit | diff
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 diff1 | diff2 | blob | history
arch/x86/include/asm/cpufeature.h diff1 | diff2 | blob | history
drivers/acpi/processor_driver.c diff1 | diff2 | blob | history
drivers/base/bus.c diff1 | diff2 | blob | history
drivers/idle/intel_idle.c diff1 | diff2 | blob | history
fs/sysfs/inode.c diff1 | diff2 | blob | history
include/acpi/processor.h diff1 | diff2 | blob | history
include/linux/device.h diff1 | diff2 | blob | history
include/linux/mod_devicetable.h diff1 | diff2 | blob | history
scripts/mod/file2alias.c diff1 | diff2 | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git