From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 16 May 2007 01:46:25 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.22-rc2~88
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=0e402c6ec4f32a9192a30c4a5b5ba6867c0be7bc;p=powerpc.git

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:
  ucc_geth: eliminate max-speed, change interface-type to phy-connection-type
  smc911x: fix compilation breakage
  pasemi_mac: Fix local-mac-address parsing
  pasemi_mac: Terminate PCI ID list
  pasemi_mac: Interrupt ack fixes
  pasemi_mac: Fix register defines
---

0e402c6ec4f32a9192a30c4a5b5ba6867c0be7bc