Automatic merge of 'for-linus' branch from

rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
This commit is contained in:
Linus Torvalds 2005-05-26 10:27:39 -07:00
commit f49809fe9b
23 changed files with 1222 additions and 1019 deletions