| commit | b0b020d4783fbc4cc477e2ca678ac47c50d5bc3e | [log] [tgz] |
|---|---|---|
| author | Jeff Garzik <jgarzik@pobox.com> | Sat Jan 28 16:06:30 2006 -0500 |
| committer | Jeff Garzik <jgarzik@pobox.com> | Sat Jan 28 16:06:30 2006 -0500 |
| tree | 0b241c17a89330382527e667f96b64cc22397cfc | |
| parent | 6651a5c3839517685c601e44979f19de8b6249c3 [diff] | |
| parent | 4a99ac3a9ee7e1b90ebc3ddbb44db75eef5c41e6 [diff] |
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6