From: Tony Lindgren <tony@atomide.com>
Date: Wed, 21 Nov 2007 02:27:29 +0000 (-0800)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.24-omap1~194
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99ed771ddc41977332a4bdd55e51cae115789301;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

Merge branch 'linus'

Conflicts:

	arch/arm/mach-omap1/board-h2.c
	arch/arm/mach-omap2/clock.c
	drivers/video/omap/Kconfig
	net/ipv4/netfilter/Makefile
---

99ed771ddc41977332a4bdd55e51cae115789301
Reading git-diff-tree failed