Merge branch 'core/locking' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
Ingo Molnar [Mon, 3 May 2010 07:17:46 +0000 (09:17 +0200)]

Trivial merge