| commit | 9e4144abf8a30ae221311368bbb10690ebdb4b76 | |
| author | Ingo Molnar <mingo@elte.hu> | |
| Thu, 10 Jul 2008 06:17:14 +0000 (10 08:17 +0200) | ||
| committer | Ingo Molnar <mingo@elte.hu> | |
| Thu, 10 Jul 2008 06:17:14 +0000 (10 08:17 +0200) | ||
| tree | 032289d5b7d87976675c1a1a32d512a44d234fa2 | treesnapshot (tar.gz zip) |
| parent | e17ba73b0ee6c0f24393c48b455e0d8db761782c | commitdiff |
| parent | 6329d3021bcfa9038621e6e917d98929421d8ec8 | commitdiff |
Merge branch 'linus' into core/printk
Conflicts:
kernel/printk.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Conflicts:
kernel/printk.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| include/linux/kernel.h | diff1 | diff2 | blobhistory |