summaryrefslogtreecommitdiff
path: root/net/l2tp
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-12-19 14:12:11 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-12-19 14:12:11 -0500
commit9763152c94ff7207b3532b4105272a0a6030cd61 (patch)
treeca5b917143a04cbb5fcd494c2459b0b7e405c64e /net/l2tp
parent78feb35b8161acd95c33a703ed6ab6f554d29387 (diff)
parentd7660918fce210f421cc58c060ca3de71e4ffd37 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
Diffstat (limited to 'net/l2tp')
0 files changed, 0 insertions, 0 deletions