Merge branch 'core/locking' into perfcounters/core
Ingo Molnar [Wed, 6 May 2009 06:46:27 +0000 (08:46 +0200)]
Merge reason: we moved a mutex.h commit that originated from the
              perfcounters tree into core/locking - but now merge
      back that branch to solve a merge artifact and to
      pick up cleanups of this commit that happened in
      core/locking.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1  2 
kernel/mutex.c

diff --cc kernel/mutex.c
Simple merge