Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...
authorJeff Garzik <jeff@garzik.org>
Tue, 25 Sep 2007 19:47:12 +0000 (15:47 -0400)
committerJeff Garzik <jeff@garzik.org>
Tue, 25 Sep 2007 19:47:12 +0000 (15:47 -0400)
commit2aee6198652b32e5eaef29a8f8330a9dd15b8efd
treea95da0809e23f506639309d584468edb87f60212
parent402c79fb1944c8e003a32d07f31504b769fe2b52
parentd59952d532ed8fc93ccb98186f73d9ce5cfcb93d
Merge branch 'fixes-jgarzik' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes