Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 29 Sep 2007 16:25:55 +0000 (09:25 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 29 Sep 2007 16:25:55 +0000 (09:25 -0700)
commited7fdff5d6754f9ef9e47bbf0b171d3d96fb7e41
tree5ffcfeb380854f8be4303588f92efa267b3c656d
parent4827bbb06e4b59922c2b9bfb13ad1bf936bdebe5
parent2bcff60f7ce88c09a2bc1302ff14510737bfcb7b
Merge branch 'upstream-linus' of /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