| commit | 3ce4af1defe55591925362ca1ef8363ba04e0feb | |
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Thu, 1 Nov 2007 22:07:29 +0000 (1 15:07 -0700) | ||
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Thu, 1 Nov 2007 22:07:29 +0000 (1 15:07 -0700) | ||
| tree | 05b334a4d011ac1e8ff40daf03ee46bdee293093 | treesnapshot (tar.gz zip) |
| parent | 54866f032307063776b4eff7eadb131d47f9f9b4 | commitdiff |
| parent | c956a24018819bd903fad0cd275a63c089cdba53 | commitdiff |
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
* '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