tree cff90b5421967f17d11a7611a9c5f0fca0be4d67
parent aacf094128759cfb29a3ce88f92d08b79b74a4e8
parent 2f31b51659c2d8315ea2888ba5b93076febe672b
author Tony Lindgren <tony@atomide.com> 1324072823 -0800
committer Tony Lindgren <tony@atomide.com> 1324072823 -0800

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