Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...
authorJeff Garzik <jeff@garzik.org>
Sat, 1 Dec 2007 21:20:02 +0000 (16:20 -0500)
committerJeff Garzik <jeff@garzik.org>
Sat, 1 Dec 2007 21:20:02 +0000 (16:20 -0500)
commit85b161a826f1954e9605deb3e6faa4be4d285a34
treeddad5bc7192a29afa97a3de9ed74d01cbb53c5e9
parentc99da91e7a12724127475a85cc7a38214b3504e2
parent3ae6a054553ee8b7f74bf7de8904022b26705778
Merge branch 'fixes-jgarzik' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes