Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...
authorJeff Garzik <jeff@garzik.org>
Wed, 3 Oct 2007 17:39:16 +0000 (13:39 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 3 Oct 2007 17:39:16 +0000 (13:39 -0400)
commit5c55c434917429f229a1bf43def97fd421f444c6
treead299c2f5c63a560ce6c37b913bb60a791d5c1a3
parentf778089cb2445dfc6dfd30a7a567925fd8589f1e
parentee0a8169b693e1c708d0f9af0a5e4ade65a65439
Merge branch 'fixes-jgarzik' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes