Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.osdl.org>
Mon, 11 Dec 2006 20:22:58 +0000 (12:22 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Mon, 11 Dec 2006 20:22:58 +0000 (12:22 -0800)
commit116140b7f5c9182c86a4e419f81684209357aea7
tree596e6d1a3121c022afd1bf29637b6bc6bb06d086
parent8d610dd52dd1da696e199e4b4545f33a2a5de5c6
parent8af905b4a403ce74b8d907b50bccc453a58834bc
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:
  [PATCH] smc91x: Kill off excessive versatile hooks.
  [PATCH] myri10ge: update driver version to 1.1.0
  [PATCH] myri10ge: fix big_bytes in case of vlan frames
  [PATCH] myri10ge: Full vlan frame in small_bytes
  [PATCH] myri10ge: drop contiguous skb routines
  [PATCH] myri10ge: switch to page-based skb
  [PATCH] myri10ge: add page-based skb routines
  [PATCH] myri10ge: indentation cleanups
  [PATCH] chelsio: working NAPI
  [PATCH] MACB: Use __raw register access
  [PATCH] MACB: Use struct delayed_work instead of struct work_struct
  [PATCH] ucc_geth: Initialize mdio_lock.
  [PATCH] ucc_geth: compilation error fixes