Merge commit 'v2.6.28-rc8' into x86/mm
[linux-2.6] / net / atm / protocols.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2