From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 6 Dec 2010 14:14:47 +0000 (+0000)
Subject: Merge branch 'for-2.6.37' into for-2.6.38
X-Git-Tag: v2.6.38-rc1~236^2^2~75
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0afc8c733e95642ee9200966081da82564af8f8f;p=pandora-kernel.git

Merge branch 'for-2.6.37' into for-2.6.38

Conflicts:
	include/linux/mfd/wm8994/pdata.h
---

0afc8c733e95642ee9200966081da82564af8f8f
Reading git-diff-tree failed