| commit | 6003ab0bad4cc56f3c4fadf62a0d23a967b9c53b | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Wed Sep 10 09:09:51 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Wed Sep 10 09:09:51 2008 +0200 |
| tree | 2087ca69776116b70a6af0daae9c10bfac1aa347 | |
| parent | ab7476cf76e560f0efda2a631a70aabe93009025 [diff] | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 [diff] |
Merge branch 'linus' into core/debug Conflicts: lib/vsprintf.c Manual merge: include/linux/kernel.h Signed-off-by: Ingo Molnar <mingo@elte.hu>