| commit | a513c315f95c6d73041436fd1598d51722bd6264 | [log] [tgz] |
|---|---|---|
| author | Jeff Garzik <jeff@garzik.org> | Sat Aug 19 17:46:13 2006 -0400 |
| committer | Jeff Garzik <jeff@garzik.org> | Sat Aug 19 17:46:13 2006 -0400 |
| tree | 505f9a15c1771756cf21011e3f291b81c86cb3df | |
| parent | fd6746daade513bf7f887625c107878b6aacccfd [diff] | |
| parent | 113b898e38cb20e80847c24154ce62273b948c6a [diff] |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream