aboutsummaryrefslogtreecommitdiff
path: root/net/bridge/br_if.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-09 14:16:23 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-09 14:16:23 -0700
commit6329d3021bcfa9038621e6e917d98929421d8ec8 (patch)
treec00f4b92ba8eaa433db8aea989bfe1b5a6cf074f /net/bridge/br_if.c
parentb72e9ebe7efa5754aa53bbdb0040a2d6eeb34db3 (diff)
parent5e19cf663be534c7c15a35a86fa7ddc9f797e4f4 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: RDMA/cxgb3: Fix regression caused by class_device -> device conversion
Diffstat (limited to 'net/bridge/br_if.c')
0 files changed, 0 insertions, 0 deletions