Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm
[linux-2.6.git] / drivers / pcmcia / sa1111_jornada720.c
2012-02-21 Russell King PCMCIA: sa1111: rename sa1111 socket drivers to have...