summaryrefslogtreecommitdiffstats
path: root/net/bridge/br_stp.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-03-15 15:06:35 -0700
committerDavid S. Miller <davem@davemloft.net>2011-03-15 15:06:35 -0700
commit30df754dedebf27ef90452944a723ba058d23396 (patch)
tree80685c0377dec0980b31cdecf52114747224da3f /net/bridge/br_stp.c
parent9ecb42fda614c4e4f46e95712621510f8d746980 (diff)
parent1fb0ef31f428f345a7c3666f8e7444a563edd537 (diff)
downloadop-kernel-dev-30df754dedebf27ef90452944a723ba058d23396.zip
op-kernel-dev-30df754dedebf27ef90452944a723ba058d23396.tar.gz
Merge branch 'irq/numa' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
Diffstat (limited to 'net/bridge/br_stp.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud