| commit | 83f2f0ed715eb15a8e13c07df479d65bbc10d8d5 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Thu Apr 02 16:33:42 2009 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Thu Apr 02 16:33:51 2009 +0200 |
| tree | e47d7edefa210b328f8cfba43d170fc67d6e0671 | |
| parent | 3de46fda4c104deef17ec70f85361f5c6b84ce0e [diff] | |
| parent | 4fe70410d9a219dabb47328effccae7e7f2a6e26 [diff] |
Merge branch 'linus' into x86/urgent Merge needed to go past commit 7ca43e756 (mm: use debug_kmap_atomic) and fix it. Signed-off-by: Ingo Molnar <mingo@elte.hu>