| commit | f6dc8ccaab6d8f63cbae1e6c73fe972b26f5376c | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Jul 18 21:13:20 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Jul 18 21:13:20 2008 +0200 |
| tree | c5643fcdc884a8d0bfc3f1bc28039cab7394e5bc | |
| parent | 323ec001c6bb98eeabb5abbdbb8c8055d9496554 [diff] | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e [diff] |
Merge branch 'linus' into core/generic-dma-coherent Conflicts: kernel/Makefile Signed-off-by: Ingo Molnar <mingo@elte.hu>