projects / platform / kernel / linux-amlogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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>
1  2 
drivers/scsi/scsi_scan.c patch | diff1 | diff2 | blob | history
drivers/usb/host/ehci-fsl.c patch | diff1 | diff2 | blob | history

diff --cc drivers/scsi/scsi_scan.c
Simple merge
diff --cc drivers/usb/host/ehci-fsl.c
Simple merge
Domain: System / Kernel;