summaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2x.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-03-08 21:24:11 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-03-08 21:24:11 +0100
commit91e013827c0bcbb187ecf02213c5446b6f62d445 (patch)
tree52ad3d0db856c50ab3a1a56da2bf3ae6ed8a8f48 /drivers/net/bnx2x.h
parentMerge branch 'origin' into devel-stable (diff)
parentARM: 5961/1: ux500: fix CLKRST addresses (diff)
downloadlinux-91e013827c0bcbb187ecf02213c5446b6f62d445.tar.xz
linux-91e013827c0bcbb187ecf02213c5446b6f62d445.zip
Merge branch 'master' into for-linus
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions