Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...
authorJeff Garzik <jeff@garzik.org>
Sat, 20 Oct 2007 03:04:50 +0000 (23:04 -0400)
committerJeff Garzik <jeff@garzik.org>
Sat, 20 Oct 2007 03:04:50 +0000 (23:04 -0400)
commitfe2520094d88018423dfc42b3cd0015f74e8adea
tree859b78d64961ad92873e835ad1520caeb34b292f
parentc9b2ca735a7685fa8aafd17b3cf3f9f20449d10b
parent1f06862e11f23ebc99438c592be9c92560d78548
Merge branch 'fixes-jgarzik' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream