Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Wed, 30 May 2007 13:46:14 +0000 (09:46 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 30 May 2007 13:46:14 +0000 (09:46 -0400)
commit8903bab009d3e9b34050042f8c0faf741eb027be
tree1e1df689c95e3eafda6fac8d5503cf9b8caac8bc
parent7f397dcdb78d699a20d96bfcfb595a2411a5bbd2
parentd7ea3be56adc95b17351221fd95e78115f3b01f4
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes