Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 27 Feb 2006 15:41:11 +0000 (07:41 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 27 Feb 2006 15:41:11 +0000 (07:41 -0800)
commit6d6585e490d985d421d7cd3cfc7d77b618c44130
treebf8c941eec540f0e30a37252be031c5504a24e16
parentb9a33cebac70d6f67a769ce8d4078fee2b254ada
parent7bef4b397874eee4484457040e8a1013361d7758
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/netdev-2.6