Auto merge with /home/aegl/GIT/linus
[linux-2.6] / drivers / pcmcia / au1000_generic.c
2005-04-16  Pavel Machek[PATCH] fix u32 vs. pm_message_t in pcmcia
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2