Merge tag 'v3.3-rc7' into x86/mce
authorIngo Molnar <mingo@elte.hu>
Wed, 14 Mar 2012 06:44:11 +0000 (07:44 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 14 Mar 2012 06:44:11 +0000 (07:44 +0100)
commitcd593accdcc27ccbe6498d9ad1c2b6cc8e1d830d
tree9424d3ac86e753706cc6c3d7e6072d2a73711e29
parent11b91d6fe7272452c999573bab33c15c2f03dc31
parentfde7d9049e55ab85a390be7f415d74c9f62dd0f9
Merge tag 'v3.3-rc7' into x86/mce

Merge reason: Update from an ancient -rc1 base to an almost-final stable kernel.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
drivers/base/memory.c