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