[git pull] PCMCIA updates and fixes for 2.6.28

Linus Torvalds torvalds at linux-foundation.org
Mon Oct 13 17:14:03 EDT 2008

Previous message: [PATCH 22/49] pcmcia: deprecate CS_SUCCESS
Next message: [PATCH 01/49] pcmcia: only copy CIS override data once
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]


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

Previous message: [PATCH 22/49] pcmcia: deprecate CS_SUCCESS
Next message: [PATCH 01/49] pcmcia: only copy CIS override data once
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the linux-pcmcia mailing list