diff options
| author |   David S. Miller <davem@davemloft.net> | 2011-05-10 15:04:35 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-10 15:04:35 -0700 |
| commit | 9bbc052d5e63512b0ce4e201ea97e12fba9fda82 (patch) | |
| tree | 30433e20961b73e571c081869d1ea52c92c7b15a /net/xfrm | |
| parent | slcan: fix ldisc->open retval (diff) | |
| parent | netfilter: revert a2361c8735e07322023aedc36e4938b35af31eb0 (diff) | |
| download | linux-dev-9bbc052d5e63512b0ce4e201ea97e12fba9fda82.tar.xz linux-dev-9bbc052d5e63512b0ce4e201ea97e12fba9fda82.zip | |
Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6
Diffstat (limited to 'net/xfrm')
0 files changed, 0 insertions, 0 deletions