Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Fri, 9 Mar 2007 16:58:11 +0000 (11:58 -0500)
committerJeff Garzik <jeff@garzik.org>
Fri, 9 Mar 2007 16:58:11 +0000 (11:58 -0500)
commit0a38f5442053b10c773b6a10a4d67e2293551f12
tree811e84601fecc22b342caae168c95eff76a5ea5e
parent82c00b62c811142c8e7d3aef92fbf3fc77b83709
parent7d9f3e85f45e8f636bdd7ce5f0b1704034380175
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes