From: Tony Lindgren <tony@atomide.com>
Date: Thu, 25 Jan 2007 22:21:41 +0000 (-0800)
Subject: Merge branch 'master' of /home/tmlind/src/kernel/linux-2.6/
X-Git-Tag: v2.6.21-omap1~151
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6a5d6a63591af9e0ee908644c137e2b72a87c9b;p=pandora-kernel.git

Merge branch 'master' of /home/tmlind/src/kernel/linux-2.6/

Conflicts:

	drivers/mmc/omap.c
	drivers/mtd/nand/Makefile
---

f6a5d6a63591af9e0ee908644c137e2b72a87c9b
Reading git-diff-tree failed