Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 28 Feb 2006 00:35:48 +0000 (19:35 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 28 Feb 2006 00:35:48 +0000 (19:35 -0500)
commit09e4f9029da1b53e835555c353a89c36b71233b0
tree81d2a6de51b1bb3c704e5385dbc90ca79efa69bc
parent750b50ab5687125d8a1dc946d931b00acf016e2c
parentdbfedbb98145375106cee7ec7269611d553819dc
Merge branch 'upstream' of git://git./linux/kernel/git/jgarzik/netdev-2.6