Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 13 Dec 2005 00:41:37 +0000 (16:41 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 13 Dec 2005 00:41:37 +0000 (16:41 -0800)
commit238523e1a15874b88955ff9c8f63e35597ae2857
tree3a794b119a40a7dd5bd73b513297c4580a090303
parent1ff8038988adecfde71d82c0597727fc239d4e8c
parent016cc85072944bfa03c5e4b587ae89588ce2e5df
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/netdev-2.6