Merge branch 'core/locking' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Wed, 6 May 2009 06:46:27 +0000 (08:46 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 6 May 2009 06:47:26 +0000 (08:47 +0200)
commit3611dfb8eda847c1c8e1a052f57206f7fddc6a7c
tree74b5d689be8bfca2ec0fe18961ccaf6953c21dba
parent16c8a10932aef971292c9570eb5f60b5d4e83ed2
parenta511e3f968c462a55ef58697257f5347c73d306e
Merge branch 'core/locking' into perfcounters/core

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>
kernel/mutex.c