Merge branch 'x86/asm' into x86/urgent
[safe/jmp/linux-2.6] / drivers / pcmcia / bcm63xx_pcmcia.h
2009-09-30 Maxime BizonMIPS: BCM63xx: Add PCMCIA & Cardbus support.