Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / mach-ixp2000 / ixdp2x00.c