Merge branch 'core/printk' into tracing/ftrace
authorIngo Molnar <mingo@elte.hu>
Tue, 10 Mar 2009 16:17:32 +0000 (17:17 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 10 Mar 2009 16:17:32 +0000 (17:17 +0100)
commit2395037e5dd6841a6fa23afbb31e79d92e549cd1
tree953ad725344aca1f89da86358737e5dc0b93b46e
parentbbcd3063597a3824357cd83c501c2a2aa21ef37b
parent39e874f8afbdb3745e2406ce4ecbde9ac4cbaa78
Merge branch 'core/printk' into tracing/ftrace