Merge branch 'tracking-armlt-mcpm' into lsk-3.10-vexpress
authorJon Medhurst <tixy@linaro.org>
Wed, 17 Jul 2013 11:01:44 +0000 (12:01 +0100)
committerJon Medhurst <tixy@linaro.org>
Wed, 17 Jul 2013 11:01:44 +0000 (12:01 +0100)
1  2 
arch/arm/mach-vexpress/v2m.c

Simple merge