Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Dec 2009 20:33:02 +0000 (12:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Dec 2009 20:33:02 +0000 (12:33 -0800)
commitfb1beb29b5c531b12485d7c32174a77120590481
treecb7d1d9733d351ae0ec7acda4851b27acd10abca
parent478e4e9d7a618379676b17e64583ff3622f2fec5
parent9fea84f46a821aa1ff2d034ffda8ad33bff48015
Merge git://git./linux/kernel/git/brodo/pcmcia-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  pcmcia: CodingStyle fixes
  pcmcia: remove unused IRQ_FIRST_SHARED
drivers/net/pcmcia/axnet_cs.c
drivers/net/pcmcia/fmvj18x_cs.c
drivers/net/pcmcia/pcnet_cs.c
drivers/net/pcmcia/smc91c92_cs.c
drivers/net/pcmcia/xirc2ps_cs.c
drivers/pcmcia/Kconfig
drivers/pcmcia/cardbus.c