Merge tag 'v3.6-rc7' into core/rcu
authorIngo Molnar <mingo@kernel.org>
Tue, 25 Sep 2012 07:24:59 +0000 (09:24 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 25 Sep 2012 07:26:55 +0000 (09:26 +0200)
Merge Linux 3.6-rc7, to pick up fixes and to resolve a conflict in an
upcoming pull.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge