From: Tony Lindgren <tony@atomide.com>
Date: Sun, 16 Dec 2007 00:08:15 +0000 (-0800)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.24-omap1~113
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85faa2b7655e0c4cb9c1806bef38f6d7e8a51f89;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	arch/arm/kernel/entry-armv.S
	drivers/i2c/busses/i2c-omap.c
---

85faa2b7655e0c4cb9c1806bef38f6d7e8a51f89
Reading git-diff-tree failed