Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / pcmcia / sa1111_generic.c