Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
[safe/jmp/linux-2.6] / drivers / pcmcia / pxa2xx_cm_x2xx.c
2008-10-07 Mike Rapoport[ARM] 5283/1: pxa: add CM-X255 pcmcia support