Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Thu, 24 May 2007 21:17:11 +0000 (17:17 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 24 May 2007 21:17:11 +0000 (17:17 -0400)
commitc71cd01989b417317f4d22ccf4ce112859671b64
tree5447a67ba5ed686277db7dd3c95cadc2fb305090
parentefa5bf1dd2cf3cdee0bfe97cfd76ff2296179ae4
parent412e8a0ebf1a58c060cc76438e5b6d33789c5e20
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes