summaryrefslogtreecommitdiff
path: root/net/bridge/Kconfig
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2012-10-28 18:28:52 (GMT)
committerJiri Kosina <jkosina@suse.cz>2012-10-28 18:29:19 (GMT)
commit3bd7bf1f0fe14f591c089ae61bbfa9bd356f178a (patch)
tree0058693cc9e70b7461dae551f8a19aff2efd13ca /net/bridge/Kconfig
parentf16f84937d769c893492160b1a8c3672e3992beb (diff)
parente657e078d3dfa9f96976db7a2b5fd7d7c9f1f1a6 (diff)
downloadlinux-3bd7bf1f0fe14f591c089ae61bbfa9bd356f178a.tar.xz
Merge branch 'master' into for-next
Sync up with Linus' tree to be able to apply Cesar's patch against newer version of the code. Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'net/bridge/Kconfig')
0 files changed, 0 insertions, 0 deletions