Subject: linux-next: manual merge of the usb tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 7 Feb 2011 15:08:02 +1100

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/ehci-pci.c between commit
baab93afc2844b68d57b0dcca5e1d34c5d7cf411 ("USB: EHCI: ASPM quirk of ISOC
on AMD Hudson") from Linus' tree and commit
b7d5b439b7a40dd0a0202fe1c118615a3fcc3b25 ("USB host: Move AMD PLL quirk
to pci-quirks.c") from the usb tree.

I just use the version from the usb tree, but this may need fixing up in
pci-quirks.c.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/