git.openpandora.org / pandora-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fde7d90 b790f5d)
Merge 3.3-rc7 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 12 Mar 2012 16:13:31 +0000 (09:13 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 12 Mar 2012 16:13:31 +0000 (09:13 -0700)
commitf7a0d426f3e7ec321b8037238b6426566df36edb
tree505e7d0264500db94534f1226684f78af7757289tree | snapshot
parentfde7d9049e55ab85a390be7f415d74c9f62dd0f9commit | diff
parentb790f5d1260b4c962bd066cd34ae982943c27fe1commit | diff
Merge 3.3-rc7 into usb-next

This resolves the conflict with drivers/usb/host/ehci-fsl.h that
happened with changes in Linus's and this branch at the same time.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/scsi/scsi_scan.c diff1 | diff2 | blob | history
drivers/usb/host/ehci-fsl.c diff1 | diff2 | blob | history
Pandora Kernel Repository