| commit | d1a76187a5be4f89c6cb19d800cb5fb7aac735c5 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Tue Oct 28 16:54:49 2008 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Tue Oct 28 16:54:49 2008 +0100 |
| tree | 2fac3ffbfffc7560eeef8364b541d0d7a0057920 | |
| parent | c7e78cff6b7518212247fb20b1dc6411540dc9af [diff] | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 [diff] |
Merge commit 'v2.6.28-rc2' into core/locking Conflicts: arch/um/include/asm/system.h