tree 953ad725344aca1f89da86358737e5dc0b93b46e
parent bbcd3063597a3824357cd83c501c2a2aa21ef37b
parent 39e874f8afbdb3745e2406ce4ecbde9ac4cbaa78
author Ingo Molnar <mingo@elte.hu> 1236701852 +0100
committer Ingo Molnar <mingo@elte.hu> 1236701852 +0100

Merge branch 'core/printk' into tracing/ftrace