Messages in this thread | | | Date | Mon, 21 May 2012 06:08:57 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the usb tree with the net-next tree |
| |
On Mon, May 21, 2012 at 04:10:08PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > drivers/net/wireless/ath/ath6kl/usb.c between commit 9cbee358687e > ("ath6kl: add full USB support") from the net-next tree and commit > e1f12eb6ba6f ("USB: Disable hub-initiated LPM for comms devices") from > the usb tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary.
Looks good to me, thanks.
greg k-h
| |