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

This commit is contained in:
David S. Miller 2008-03-28 19:48:26 -07:00
commit 17eed24953
20 changed files with 1678 additions and 1245 deletions