| commit | cb28a1bbdb4790378e7366d6c9ee1d2340b84f92 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Tue Jul 29 00:07:55 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Tue Jul 29 00:07:55 2008 +0200 |
| tree | 316436f77dac75335fd2c3ef5f109e71606c50d3 | |
| parent | b6d4f7e3ef25beb8c658c97867d98883e69dc544 [diff] | |
| parent | f934fb19ef34730263e6afc01e8ec27a8a71470f [diff] |
Merge branch 'linus' into core/generic-dma-coherent Conflicts: arch/x86/Kconfig Signed-off-by: Ingo Molnar <mingo@elte.hu>