Subject: linux-next: manual merge of the usb tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 7 Jul 2008 13:09:41 +1000

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/core/hub.c between commit
09ca8adbe9f724a7e96f512c0039c4c4a1c5dcc0 ("Revert "USB: don't explicitly
reenable root-hub status interrupts"") from Linus' tree and commit
hub_events ("USB: simplify hub_restart() logic") from the usb tree.

I fixed it up but definitely worth a check to make sure that the end of
hub_events() still make sense.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/