Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

Browse source

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

...

This commit is contained in:

Linus Torvalds 2007-11-01 15:07:29 -07:00

parent 54866f0323 c956a24018

commit 3ce4af1def

3 changed files with 6 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

drivers/net/Kconfig

View file

4

drivers/net/fec_mpc52xx.c

View file

6

drivers/net/myri10ge/myri10ge.c

View file