Merge branch 'master' of hera.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
[linux-2.6] / include / asm-m68k / resource.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2