Merge branch 'linus' into x86/urgent
[sfrench/cifs-2.6.git] / include / asm-frv / resource.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2