From: Tony Lindgren <tony@atomide.com>
Date: Fri, 25 Apr 2008 18:49:52 +0000 (-0700)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.26-omap1~123^2~166
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4bb9f8b58ed7d14d276750d1792cef9b3aa1e9ec;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	sound/soc/Kconfig
	sound/soc/Makefile
---

4bb9f8b58ed7d14d276750d1792cef9b3aa1e9ec
Reading git-diff-tree failed