| commit | 76df73ff90e99681a99e457aec4cfe0a240b7982 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue Jun 13 15:38:11 2006 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue Jun 13 15:38:11 2006 -0400 |
| tree | 0a6302b1a8e5d11aeed8aa49f7e846f35aad4f5a | |
| parent | 5c601d0c942f5aaf7f3cff7e08f61047d70a964e [diff] | |
| parent | 86bc843a268058df558844b6bf64531617fbc698 [diff] |
Merge branch 'from-linus' into upstream