Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Tue, 28 Feb 2006 23:04:30 +0000 (18:04 -0500)
committerJeff Garzik <jeff@garzik.org>
Tue, 28 Feb 2006 23:04:30 +0000 (18:04 -0500)
commitce7eeb6b52bf1fc2a219503072732f35741d11de
tree313d1d2e7cc1d26ce8ef29087c91f12d1ed4d0ff
parent816fd404718fc6064ddb05e6b310b2bc2ae7a187
parent4832843d773462643cc471ca715382f5e509afb3
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6