| commit | bd1d462e13b278fc57752d0b9b15040e60e561a0 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Thu Feb 02 11:24:44 2012 -0800 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Thu Feb 02 11:24:44 2012 -0800 |
| tree | e2fdf1c18a93aab02830bcb8a5db8cdddfbb63a8 | |
| parent | d5c38b137ac8a6e3dbed13bc494d60df5b69dfc4 [diff] | |
| parent | 62aa2b537c6f5957afd98e29f96897419ed5ebab [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>