From: Tony Lindgren <tony@atomide.com>
Date: Fri, 16 Dec 2011 22:00:23 +0000 (-0800)
Subject: Merge branch 'tk_prm_chain_handler_devel_3.3' of git://git.pwsan.com/linux-2.6 into... 
X-Git-Tag: v3.3-rc1~137^2~4^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d297f5ee1b92a84e2cd6c547c3ac1f893128359;p=pandora-kernel.git

Merge branch 'tk_prm_chain_handler_devel_3.3' of git://git.pwsan.com/linux-2.6 into prcm

Conflicts:
	arch/arm/mach-omap2/Makefile
---

9d297f5ee1b92a84e2cd6c547c3ac1f893128359
Reading git-diff-tree failed