| commit | eb1574270a6de8fb8d31ffc3b021e30df0afcda3 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Wed May 02 14:33:37 2012 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Wed May 02 14:33:37 2012 -0700 |
| tree | d154ba369f222f5108ed1a2462d815d7faadc2e5 | |
| parent | aac10aaa8cc65a6fef6f5bc7d0b96035b0225a61 [diff] | |
| parent | 69964ea4c7b68c9399f7977aa5b9aa6539a6a98a [diff] |
Merge 3.4-rc5 into driver-core-next This was done to resolve a merge issue with the init/main.c file. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>