From: Tony Lindgren <tony@atomide.com>
Date: Thu, 23 Apr 2009 19:49:17 +0000 (-0700)
Subject: Merge branch 'omap-pool'
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~163
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7ec1b372b2a854a4b810b91ac1fdd4fbc15fe8b;p=pandora-kernel.git

Merge branch 'omap-pool'

Conflicts:
	arch/arm/mach-omap2/clock24xx.c
	include/asm-arm/.gitignore
	include/linux/spi/ads7846.h
---

d7ec1b372b2a854a4b810b91ac1fdd4fbc15fe8b
Reading git-diff-tree failed