summaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-10-19 19:55:42 +0200
committerJohn W. Linville <linville@tuxdriver.com>2012-10-19 19:55:42 +0200
commit06f40a41b80e25e88a2b612ea3b2a94f93c94f72 (patch)
treefa3bc4d691d7024425183bfc1be75a36c4e1d3f3 /net/bridge
parentMerge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge (diff)
parentMerge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber... (diff)
downloadlinux-06f40a41b80e25e88a2b612ea3b2a94f93c94f72.tar.xz
linux-06f40a41b80e25e88a2b612ea3b2a94f93c94f72.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/bridge')
0 files changed, 0 insertions, 0 deletions