aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/sonic.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-29 13:22:07 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-29 13:22:07 -0700
commitefab03d998da03f67836ffc664b04e0400f85448 (patch)
tree75ca0a8c5147c2b5bb7c226fd4f6e4cd6d8684cb /drivers/net/sonic.h
parent9415fddd99e12d57640774a3043a809140245c40 (diff)
parentd8d79201eb391ae0eca05f9e51f1f94ab42b6b4e (diff)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: NetXen: Fix hardware access for ppc architecture. sis190: new PHY support atl1: save mac address on remove
Diffstat (limited to 'drivers/net/sonic.h')
0 files changed, 0 insertions, 0 deletions