Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 13 Dec 2005 05:42:17 +0000 (21:42 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 13 Dec 2005 05:42:17 +0000 (21:42 -0800)
commit7cd082f0147c5fc94b455bcc17fe21b22dbac703
tree642dcf3b36d563aa7bb070a2a9355805483e857a
parentb11d0e48aa41b644143ca526ef8d69212fdc1cdd
parent1cf9e8a7865c0ac216034e519cf6b8505055ea50
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/netdev-2.6