| commit | 8d7ccaa545490cdffdfaff0842436a8dd85cf47b | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Thu Aug 14 12:19:59 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Thu Aug 14 12:19:59 2008 +0200 |
| tree | 8129b5907161bc6ae26deb3645ce1e280c5e1f51 | |
| parent | b2139aa0eec330c711c5a279db361e5ef1178e78 [diff] | |
| parent | 30a2f3c60a84092c8084dfe788b710f8d0768cd4 [diff] |
Merge commit 'v2.6.27-rc3' into x86/prototypes Conflicts: include/asm-x86/dma-mapping.h Signed-off-by: Ingo Molnar <mingo@elte.hu>