From: Tony Lindgren <tony@atomide.com>
Date: Mon, 5 May 2008 20:21:13 +0000 (-0700)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.26-omap1~123^2~144
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f35ebfdc4b987abe923eee79d25a04e336dee56;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	arch/arm/mach-omap1/board-h3.c
	drivers/input/touchscreen/Kconfig
	drivers/input/touchscreen/Makefile
	drivers/media/video/Kconfig
	drivers/misc/Kconfig
	include/linux/kfifo.h
	security/Makefile
---

3f35ebfdc4b987abe923eee79d25a04e336dee56
Reading git-diff-tree failed