Merge branch 'x86/asm' into x86/urgent
[safe/jmp/linux-2.6] / drivers / pcmcia / pxa2xx_stargate2.c
2009-06-05 Jonathan Cameron[ARM] pxa/stargate2: add support for Compact Flash...