aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sni_82596.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-04-19 14:28:35 -0400
committerDavid S. Miller <davem@davemloft.net>2011-04-19 14:28:35 -0400
commit0b0dc0f17f98b59772ca6380c7d5ce4cc593a974 (patch)
tree1f1248a3402d519f522efaf91b68c8f85e2436bc /drivers/net/sni_82596.c
parent0553c891fabd287726b41076cfd03fe7e5ab596f (diff)
parenta8a8a0937e22a5fd55aeb22586724ba6bb70aadd (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'drivers/net/sni_82596.c')
0 files changed, 0 insertions, 0 deletions