Android SDK / linux-phytec-ti / 6d55d5968a8

Commits

Olof Johansson committed 6d55d5968a8M01 Oct 2012

Merge branch 'next/soc' into HEAD

Conflicts:
	arch/arm/mach-ux500/clock.c
	arch/arm/mach-ux500/cpu.c
	drivers/clocksource/Makefile

Showing diff tof7b967bffef