From: Zhang Rui <rui.zhang@intel.com>
Date: Thu, 13 Jun 2013 03:19:36 +0000 (+0800)
Subject: Merge branches 'for-rc' and 'ti-soc' of .git into next
X-Git-Tag: v3.11-rc1~27^2~5
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=30072fb91e1447b00fa148500c49010265b530c6;p=linux.git

Merge branches 'for-rc' and 'ti-soc' of .git into next
---

30072fb91e1447b00fa148500c49010265b530c6