From: Maxim Uvarov <maxim.uvarov@oracle.com>
Date: Thu, 18 Oct 2012 10:01:46 +0000 (-0700)
Subject: Merge branch 'm-master-intel' into m-master
X-Git-Tag: v2.6.39-400.9.0~225
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bfa70ed4217ee258d4eec70868d947e805afeebd;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'm-master-intel' into m-master
---

bfa70ed4217ee258d4eec70868d947e805afeebd