Merge commit 'v2.6.29-rc1' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Sun, 11 Jan 2009 01:42:53 +0000 (02:42 +0100)
committerIngo Molnar <mingo@elte.hu>
Sun, 11 Jan 2009 01:42:53 +0000 (02:42 +0100)
Conflicts:
include/linux/kernel_stat.h


Trivial merge