From: James Morris Date: Wed, 16 Nov 2011 01:39:48 +0000 (+1100) Subject: Merge branch 'master'; commit 'v3.2-rc2' into next X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=24942c8e5cc8696064ee207ff29d4cf21f70dafc;p=linux-edison.git Merge branch 'master'; commit 'v3.2-rc2' into next --- 24942c8e5cc8696064ee207ff29d4cf21f70dafc