Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 10 Sep 2008 02:28:03 +0000 (19:28 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 10 Sep 2008 02:28:03 +0000 (19:28 -0700)
commit47abf28d5b36521558a848a346064a3a3c82bd9e
tree736e9402b52f08210b8c4bdda9d214e98a6bf7de
parent28faa979746b2352cd78a376bf9f52db953bda46
parente550dfb0c2c31b6363aa463a035fc9f8dcaa3c9b
Merge branch 'master' of /linux/kernel/git/davem/net-2.6
net/xfrm/xfrm_policy.c