summaryrefslogtreecommitdiff
path: root/net/l2tp
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-06-19 16:00:11 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-06-19 16:00:11 -0400
commit69d4cfef8befc6ed89e5e3280f3170eb3153d57a (patch)
tree63420f8bdf0b26931f7a773bde10ae0ecb3fa3a7 /net/l2tp
parent858faa57dd9e2b91f3f870fbb1185982e42f5a2b (diff)
parentea1e76a3f92f8565d395c549b9ca836c7eaa44b9 (diff)
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Diffstat (limited to 'net/l2tp')
0 files changed, 0 insertions, 0 deletions