diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-06 08:46:27 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-06 08:47:26 +0200 |
| commit | 3611dfb8eda847c1c8e1a052f57206f7fddc6a7c (patch) | |
| tree | 74b5d689be8bfca2ec0fe18961ccaf6953c21dba /crypto/internal.h | |
| parent | 16c8a10932aef971292c9570eb5f60b5d4e83ed2 (diff) | |
| parent | a511e3f968c462a55ef58697257f5347c73d306e (diff) | |
| download | op-kernel-dev-3611dfb8eda847c1c8e1a052f57206f7fddc6a7c.zip op-kernel-dev-3611dfb8eda847c1c8e1a052f57206f7fddc6a7c.tar.gz | |
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>
Diffstat (limited to 'crypto/internal.h')
0 files changed, 0 insertions, 0 deletions
