git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 479b46b 85e2efb)
Merge 2.6.38-rc5 into usb-next
authorGreg Kroah-Hartman <gregkh@suse.de>
Thu, 17 Feb 2011 17:56:40 +0000 (09:56 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 17 Feb 2011 17:56:55 +0000 (09:56 -0800)
This is needed to resolve some merge conflicts that were found
in the USB host controller patches, and reported by Stephen Rothwell.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Trivial merge
Pandora Kernel Repository