Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial
[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / net / ipip.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2