tree a14ad6c652736bb28859a7aec392a01b236ae58d
parent cc511b8d84d88ab788cddbfe8d21485b1c387493
parent 2e3d256de9d3db5a7ca19b61305627a516b54b45
author Russell King <rmk+kernel@arm.linux.org.uk> 1325768103 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1325768103 +0000

Merge branch 'for-russell' of git://hansjkoch.de/git/linux-tcc into HEAD

Conflicts:
	arch/arm/plat-omap/include/plat/common.h