Merge branch 'for-ingo' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...
authorIngo Molnar <mingo@elte.hu>
Fri, 20 Feb 2009 11:15:30 +0000 (12:15 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 20 Feb 2009 11:15:30 +0000 (12:15 +0100)
Conflicts:
mm/slub.c


Trivial merge