From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 18 Oct 2011 12:40:54 +0000 (+0100)
Subject: Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel... 
X-Git-Tag: firefly_0821_release~3680^2~4274^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cefd3e71efca6f4ef7f06f1fc507771d76072741;p=firefly-linux-kernel-4.4.55.git

Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel-stable
---

cefd3e71efca6f4ef7f06f1fc507771d76072741