Merge master.kernel.org:/home/rmk/linux-2.6-arm
[linux-2.6] / drivers / pcmcia / soc_common.c
2005-10-15  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-10-15  Pavel Machek[PATCH] zaurus: fix soc_common.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2