Merge branches 'bkl-removal', 'upstream' and 'upstream-fixes' into for-linus
[linux-2.6.git] / drivers / pcmcia / bcm63xx_pcmcia.c
2009-09-30 Maxime Bizon MIPS: BCM63xx: Add PCMCIA & Cardbus support.