Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[powerpc.git] / drivers / pcmcia / pxa2xx_cm_x270.c
2007-10-15 Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-arm
2007-10-15 Russell KingMerge branch 'pxa' into devel
2007-10-15 Mike Rapoport[ARM] 4578/1: CM-x270: PCMCIA support