Merge tag 'v3.3-rc7' into x86/mce
Ingo Molnar [Wed, 14 Mar 2012 06:44:11 +0000 (07:44 +0100)]
Merge reason: Update from an ancient -rc1 base to an almost-final stable kernel.

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

1  2 
drivers/base/memory.c

Simple merge