| commit | 1e90b7ee8cefff59b70e285557aa7920dea77e81 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@linux.ie> | Mon Nov 06 08:03:18 2006 +1100 |
| committer | Dave Airlie <airlied@linux.ie> | Mon Nov 06 08:03:18 2006 +1100 |
| tree | 2132e5dcee9e5ef9693742100953063cd6423b3a | |
| parent | 0c34d0f31a691bb649ed69f19e93fc1a723aa1d4 [diff] | |
| parent | 7b6cd95bb6c41653aed78952da0a461bd4791413 [diff] |
Merge branch 'master' into nouveau-1 Conflicts: linux-core/Makefile.kernel