From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 13 Jan 2012 15:00:22 +0000 (+0000)
Subject: Merge branch 'master' into fixes
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=4de3a8e101150feaefa1139611a50ff37467f33e;p=deliverable%2Flinux.git

Merge branch 'master' into fixes
---

4de3a8e101150feaefa1139611a50ff37467f33e