]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge commit 'v3.1-rc6' into core/locking
authorIngo Molnar <mingo@elte.hu>
Tue, 13 Sep 2011 09:08:56 +0000 (11:08 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 13 Sep 2011 09:09:04 +0000 (11:09 +0200)
Merge reason: We are queueing up locking annotation patches, move to a fresh base

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

Trivial merge