Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Fri, 23 Mar 2007 05:51:20 +0000 (01:51 -0400)
committerJeff Garzik <jeff@garzik.org>
Fri, 23 Mar 2007 05:51:20 +0000 (01:51 -0400)
commit604119a4b22b95e30dea6af3b3bfdc2f07fa4afd
tree4570297803bac5ef624c26cb0a8bcdbeef532efa
parent194c1fbe43af532a7921d483bc2a553b2f361256
parent4d881901b8c2167884d213eb546ffffc9e5e35ac
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6 into tmp