From: Tony Lindgren <tony@atomide.com>
Date: Thu, 17 Apr 2008 21:05:37 +0000 (-0700)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.25-omap1~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e015fc7dba8f5002daa0982eb81d33cc72e68e95;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	drivers/mmc/host/omap.c
---

e015fc7dba8f5002daa0982eb81d33cc72e68e95
Reading git-diff-tree failed