Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jgarzik@pobox.com>
Sat, 28 Jan 2006 21:06:30 +0000 (16:06 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 28 Jan 2006 21:06:30 +0000 (16:06 -0500)
commitb0b020d4783fbc4cc477e2ca678ac47c50d5bc3e
tree0b241c17a89330382527e667f96b64cc22397cfc
parent6651a5c3839517685c601e44979f19de8b6249c3
parent4a99ac3a9ee7e1b90ebc3ddbb44db75eef5c41e6
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6