From: Tony Lindgren <tony@atomide.com>
Date: Thu, 7 Jan 2010 01:28:49 +0000 (-0800)
Subject: Merge branch 'for_2.6.33rc_b' of git://git.pwsan.com/linux-2.6 into omap-fixes-for... 
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c411e0299d0a0a52561fe41364dca38c64725a07;p=pandora-kernel.git

Merge branch 'for_2.6.33rc_b' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus

Conflicts:
	arch/arm/plat-omap/clock.c
---

c411e0299d0a0a52561fe41364dca38c64725a07
Reading git-diff-tree failed