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:
  mv643xx_eth: Check ETH_INT_CAUSE_STATE bit

...

This commit is contained in:

Linus Torvalds 2007-09-29 09:25:55 -07:00

parent 4827bbb06e 2bcff60f7c

commit ed7fdff5d6

2 changed files with 4 additions and 2 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

2

drivers/net/mv643xx_eth.c

View file

4

drivers/net/mv643xx_eth.h

View file