Merge branch 'for-linus' from kernel.org:/.../shaggy/jfs-2.6 manually
[pandora-kernel.git] / include / asm-cris / sockios.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2