Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[safe/jmp/linux-2.6] / net / xfrm / xfrm_ipcomp.c
2008-07-26 Ilpo Järvinennet: convert BUG_TRAP to generic WARN_ON
2008-07-25 Herbert Xuipsec: ipcomp - Decompress into frags if necessary
2008-07-25 Herbert Xuipsec: ipcomp - Merge IPComp implementations