linux-next: manual merge of the usb tree with the ttydev tree
From: Stephen Rothwell
Date: Wed Jun 10 2009 - 04:41:31 EST
Hi Greg, Alan,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/serial/sierra.c between commit
from the ttydev tree and various commits from the usb tree.
There is some overlap between the ttydev patch and the usb patches. I
have just used the version of this file from USB tree (since it seems
that there are many more changes there).
Please sort this out ...
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature