From: Tony Lindgren <tony@atomide.com>
Date: Wed, 15 Apr 2009 18:22:24 +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~167
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e58316ba38aa6ffd53e2ada59142ad40cf47744;p=pandora-kernel.git

Merge branch 'omap-pool'

Conflicts:
	arch/arm/mach-omap2/board-overo.c
	arch/arm/mach-omap2/board-rx51.c
	drivers/Makefile
---

8e58316ba38aa6ffd53e2ada59142ad40cf47744
Reading git-diff-tree failed