tree 5ffcfeb380854f8be4303588f92efa267b3c656d
parent 4827bbb06e4b59922c2b9bfb13ad1bf936bdebe5
parent 2bcff60f7ce88c09a2bc1302ff14510737bfcb7b
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1191083155 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1191083155 -0700

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