Messages in this thread | | | Date | Wed, 23 Jul 2008 10:20:32 +1000 | From | Stephen Rothwell <> | Subject | airprime.c resurrected. Bad merge? |
| |
Hi Linus,
We have in your tree today:
commit 640c1bce86d1e11ee6a1263fdf6170d3210b1684 "USB: delete airprime driver" which removes (among other things) drivers/usb/serial/airprime.c.
followed later by:
commit 95da310e66ee8090119596c70ca8432e57f9a97f "usb_serial: API all change" which seems to have completely resurrected the same file (but none of the other bit removed by the above commit).
In linux-next I had resolved that conflict by removing the file. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |