Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

Browse source

* '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

...

This commit is contained in:

Linus Torvalds 2007-03-29 13:22:07 -07:00

parent 9415fddd99 d8d79201eb

commit efab03d998

3 changed files with 13 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

10

drivers/net/atl1/atl1_main.c

View file

3

drivers/net/netxen/netxen_nic_init.c

View file

1

drivers/net/sis190.c

View file