Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Tue, 26 Dec 2006 21:38:31 +0000 (16:38 -0500)
committerJeff Garzik <jeff@garzik.org>
Tue, 26 Dec 2006 21:38:31 +0000 (16:38 -0500)
commit3a960f7e350de5d087b88a4c06df236e0f4186fd
tree14e5a1b941d6e4cf7b2c9c1ed46262f427a825a9
parentaed2cec45c426c941c80d84ec89ce34f2f2607cc
parent0c234ae655a45ac3ee53a25b2e56e9bb6c27d71d
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes