Merge branch 'linus' into tracing-v28-for-linus-v3
authorIngo Molnar <mingo@elte.hu>
Sun, 19 Oct 2008 17:04:47 +0000 (19:04 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 19 Oct 2008 17:04:47 +0000 (19:04 +0200)
Conflicts:
init/main.c
kernel/module.c
scripts/bootgraph.pl


Trivial merge