aboutsummaryrefslogtreecommitdiffstats
path: root/net/l2tp
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-04-15 14:31:06 -0700
committerDavid S. Miller <davem@davemloft.net>2010-04-15 14:31:06 -0700
commit3eb14b944f2b5b6efe4e0ae3fe9601db78437d57 (patch)
treebea3d9ce130de0a73504ab94882115004b826fd6 /net/l2tp
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/ipmr-2.6 (diff)
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem (diff)
downloadlinux-dev-3eb14b944f2b5b6efe4e0ae3fe9601db78437d57.tar.xz
linux-dev-3eb14b944f2b5b6efe4e0ae3fe9601db78437d57.zip
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/l2tp')
0 files changed, 0 insertions, 0 deletions