| commit | e4ac2663ea27d5dda88d97d117080995fcfcd6d5 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue Aug 29 16:17:25 2006 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue Aug 29 16:17:25 2006 -0400 |
| tree | 74eac23956a86546ed93eac973b0bc4744b97ccc | |
| parent | 4c2be501b7e8695f8bdf4f7d5f51595ed55eea44 [diff] | |
| parent | d96299537e43681942ea272e00b0e529aa5b5fa4 [diff] |
Merge branch 'from-linus' into upstream