Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
commit3ce4af1defe55591925362ca1ef8363ba04e0feb
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 1 Nov 2007 22:07:29 +0000 (1 15:07 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 1 Nov 2007 22:07:29 +0000 (1 15:07 -0700)
tree05b334a4d011ac1e8ff40daf03ee46bdee293093
parent54866f032307063776b4eff7eadb131d47f9f9b4
parentc956a24018819bd903fad0cd275a63c089cdba53
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:
  Fix myri10ge NAPI oops & warnings
  Fix region size check in mpc5200 FEC driver
  mpc5200: Fix Kconfig dependancies on MPC5200 FEC device driver