Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / arch / parisc / include / asm / device.h
2008-10-10 Kyle McMartinparisc: move include/asm-parisc to arch/parisc/include/asm