Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...
authorJeff Garzik <jeff@garzik.org>
Tue, 7 Aug 2007 21:25:02 +0000 (17:25 -0400)
committerJeff Garzik <jeff@garzik.org>
Tue, 7 Aug 2007 21:25:02 +0000 (17:25 -0400)
commit9b7530c83d04da28fdded741e718721d509c74b1
tree9b5296bdfa3f82c490d024bc50fc262aff60a3a0
parent0ae842eaf9512d9c9479797083750c077fc7d1f8
parentfdc8f43b5e49b64b251bb48da95193a13ac0132f
Merge branch 'fixes-jgarzik' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes