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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 11 Jul 2008 16:02:45 +1000

Hi David,

Today's linux-next merge of the firmware tree got conflicts in
drivers/usb/serial/io_ti.c and drivers/usb/serial/io_fw_down3.h between
commit 933485161580b837dd84d46fb1fca7ea775f30c1 ("USB: io_ti: FIrst cut
at a big clean up") from the usb tree and commit
19aeeb5b95d53d0865ae811fc4dcc66639d661cf ("edgeport-ti: use
request_firmware()") from the firmware tree.

I just reverted the firmware tree commit for now as the fixup is quite
extensive.

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