Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
[cascardo/linux.git] / net / ipv6 / xfrm6_input.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2