Merge branches 'bkl-removal', 'upstream' and 'upstream-fixes' into for-linus
[linux-2.6.git] / drivers / pcmcia / pxa2xx_stargate2.c
2009-06-05 Jonathan Cameron [ARM] pxa/stargate2: add support for Compact Flash...