Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 24 Feb 2006 06:21:29 +0000 (22:21 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 24 Feb 2006 06:21:29 +0000 (22:21 -0800)
commitf52ee1410d563cd409b08822492273a5bc235821
tree18694453f85c25cf7ffea2d9111067451cbaed0b
parentc0eea79bd2adcc4708973fdbf72a0a292aa60d71
parentad9f6713ae59f319ed676c2d014a7756b62f1c51
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/netdev-2.6