| commit | c1cb0b77f905a2f5f297e91fafbe766acc143891 | [log] [tgz] |
|---|---|---|
| author | Jeff Garzik <jeff@garzik.org> | Thu Nov 30 06:01:04 2006 -0500 |
| committer | Jeff Garzik <jeff@garzik.org> | Thu Nov 30 06:01:04 2006 -0500 |
| tree | 64fdce32842a8fd0d0765745df7aaf207e34b07f | |
| parent | f2b67c7945e8d709444884633670fef498218639 [diff] | |
| parent | a88556a4b24baff99f5d2a2a05202c4aca44ea05 [diff] |
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes