]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
projects / mirror_ubuntu-disco-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4827bbb 2bcff60)
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)
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  mv643xx_eth: Check ETH_INT_CAUSE_STATE bit


Trivial merge
Ubuntu Disco kernel mirror for Proxmox VE and PMG