Re: [git pull] PCMCIA updates and fixes for 2.6.28

[Linus Torvalds]

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/