linux-next: manual merge of the usb tree with the usb.current tree

Tue, 13 Nov 2012 20:08:30 -0800 

Hi Greg,

Today's linux-next merge of the usb tree got conflicts in
drivers/usb/host/ehci-ls1x.c and drivers/usb/host/ohci-xls.c between
commit e592c5d0b7db ("Revert "USB/host: Cleanup unneccessary irq disable
code"") from the usb.current tree and commits ead92fae1290 ("USB: EHCI:
remove Loongson 1B EHCI driver") and c2e91e046df6 ("USB: OHCI: remove
Netlogic XLS OHCI platform driver") from the usb tree.

The latter removed the files, so I just did that and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

Attachment: pgpc2FJfV2hCM.pgp
Description: PGP signature

Reply via email to