From: Tony Lindgren <tony@atomide.com>
Date: Tue, 7 Apr 2009 22:55: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~174
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed2a95f3ce60fe24fea59633d19e8f6d993ec4ea;p=pandora-kernel.git

Merge branch 'omap-pool'

Conflicts:
	arch/arm/mach-omap2/board-ldp.c
	arch/arm/mach-omap2/board-overo.c
	drivers/regulator/core.c
	drivers/regulator/twl4030-regulator.c
	include/linux/i2c/twl4030.h
	include/linux/regulator/driver.h
---

ed2a95f3ce60fe24fea59633d19e8f6d993ec4ea
Reading git-diff-tree failed