From: Tony Lindgren <tony@atomide.com>
Date: Mon, 24 Aug 2009 09:18:17 +0000 (+0300)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.32-omap1~11^2^2~1^2^2^2^2^2~8^2^2~18^2~2^2^2~2^2^2^2^2~16^2^2~8^2^2~7^2~28
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6da08dc9f3a1e4903a8a1649afe1759c469feeb;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:
	arch/arm/mach-omap2/board-omap3evm.c
	drivers/net/netxen/netxen_nic_init.c
---

a6da08dc9f3a1e4903a8a1649afe1759c469feeb
Reading git-diff-tree failed