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)
commit76bf6877fed4f59826a72e0ab209badfc594008a
tree3e66280e0579c716991fb7cd67d771d0b8766358
parent0fa914c632210e09940f0bf5b85d2329b75e04e0
parentb6fd41e29dea9c6753b1843a77e50433e6123bcb
Merge commit 'v3.1-rc6' into core/locking

Merge reason: We are queueing up locking annotation patches, move to a fresh base

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