Skip to content
Commit 9d297f5e authored by Tony Lindgren's avatar Tony Lindgren
Browse files

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
parents aacf0941 2f31b516
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment