diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-10 08:17:14 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-10 08:17:14 +0200 |
| commit | 9e4144abf8a30ae221311368bbb10690ebdb4b76 (patch) | |
| tree | 032289d5b7d87976675c1a1a32d512a44d234fa2 /scripts/patch-kernel | |
| parent | x86, generic: mark early_printk as asmlinkage (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff) | |
| download | linux-9e4144abf8a30ae221311368bbb10690ebdb4b76.tar.gz linux-9e4144abf8a30ae221311368bbb10690ebdb4b76.zip | |
Merge branch 'linus' into core/printk
Conflicts:
kernel/printk.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'scripts/patch-kernel')
0 files changed, 0 insertions, 0 deletions