Merge branch 'master' into upstream-fixes
[linux-2.6] / include / asm-um / resource.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2