On Mon, 13 Oct 2008, Dominik Brodowski wrote: > > There's a small merge conflict due to Alan's bugfix to drivers/pcmcia/ds.c. > Could you either fix this up or explain me how to prepare the merge for you?
I fixed it up, thanks,
Linus
_______________________________________________
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia
