git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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>

Trivial merge
Pandora Kernel Repository