Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / asm-m32r / m32r_mp_fpga.h