From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 4 Oct 2012 22:59:32 +0000 (+0100)
Subject: Merge commit 'v3.6' into fixes
X-Git-Tag: v3.7-rc1~94^2^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d5e4cc8faf91bb408fdf2767f73dcfee35e193da;p=linux-platform-drivers-x86.git

Merge commit 'v3.6' into fixes
---

d5e4cc8faf91bb408fdf2767f73dcfee35e193da