From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 2 Nov 2010 13:58:49 +0000 (-0400)
Subject: Merge branch 'for-2.6.37' into HEAD
X-Git-Tag: v2.6.38-rc1~236^2^2~215
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e3be1edbe5ca57df51140b523168237b3a01f4d;p=pandora-kernel.git

Merge branch 'for-2.6.37' into HEAD

WARN() fix from Joe moved.

Conflicts:
	sound/soc/codecs/wm_hubs.c
---

9e3be1edbe5ca57df51140b523168237b3a01f4d
Reading git-diff-tree failed