linux-next: manual merge of the staging tree with the usb tree
From: Stephen Rothwell
Date: Fri May 11 2012 - 01:12:43 EST
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/quatech_usb2/quatech_usb2.c between commit 38902cf9f6be
("USB: remove staging quatech_usb2 driver") from the usb tree and a
couple of commits from the staging tree.
The former removes the file, so I did that.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature