git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 16c8a10 a511e3f)
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)
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 patch | diff1 | diff2 | blob | history

diff --cc kernel/mutex.c
Simple merge
Pandora Kernel Repository