Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jgarzik@pobox.com>
Fri, 17 Feb 2006 21:10:20 +0000 (16:10 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 17 Feb 2006 21:10:20 +0000 (16:10 -0500)
commit249b94a5f7dafe7a3963061eddad9c1bd5d67328
tree8f0f38ab444da45e47c9ba96008ad53dc0d41f5a
parentcfe91f9ce297e23e6fbdf61c02bdd8ab9af7c8a8
parent7345137930907ba747781636c60112f7c2789aa8
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6