From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sat, 22 Sep 2012 15:26:27 +0000 (-0400)
Subject: Merge tag 'v3.6-rc6' into for-3.7
X-Git-Tag: v3.7-rc1~81^2~14^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddfb43f3881edb47aa0083651ad31983cdc42c33;p=pandora-kernel.git

Merge tag 'v3.6-rc6' into for-3.7

Linux 3.6-rc6 has all our bug fixes.

Conflicts (trivial overlap):
	sound/soc/omap/am3517evm.c
---

ddfb43f3881edb47aa0083651ad31983cdc42c33
Reading git-diff-tree failed