From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 29 Sep 2007 16:25:55 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: Ubuntu-5.0.0-8.9~39694
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ed7fdff5d6754f9ef9e47bbf0b171d3d96fb7e41;p=mirror_ubuntu-disco-kernel.git

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

ed7fdff5d6754f9ef9e47bbf0b171d3d96fb7e41