Merge branches 'omap1-upstream' and 'omap2-upstream' into devel
[linux-2.6] / include / asm-m32r / resource.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2