From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sat, 28 Mar 2009 20:29:51 +0000 (+0000)
Subject: Merge branch 'origin' into devel
X-Git-Tag: v2.6.30-rc1~636^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed40d0c472b136682b2fcba05f89762859c7374f;p=pandora-kernel.git

Merge branch 'origin' into devel

Conflicts:
	sound/soc/pxa/pxa2xx-i2s.c
---

ed40d0c472b136682b2fcba05f89762859c7374f
Reading git-diff-tree failed