Merge branch 'tk_prm_chain_handler_devel_3.3' of git://git.pwsan.com/linux-2.6 into...
authorTony Lindgren <tony@atomide.com>
Fri, 16 Dec 2011 22:00:23 +0000 (14:00 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 16 Dec 2011 22:00:23 +0000 (14:00 -0800)
Conflicts:
arch/arm/mach-omap2/Makefile


Trivial merge