Merge branch 'core/printk' into tracing/ftrace
authorIngo Molnar <mingo@elte.hu>
Fri, 6 Mar 2009 16:45:42 +0000 (17:45 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 6 Mar 2009 16:45:42 +0000 (17:45 +0100)
commit546e5354a6e4ec760ac03ef1148e9a4762abb5f5
treeed9a867384f400f1270786e2cafa0d107ace6b75
parentaf438c0f114b6f731b923b5c07150f6159471502
parentfef20d9c1380f04ba9492d6463148db07b413708
Merge branch 'core/printk' into tracing/ftrace
include/linux/kernel.h