Cosmetics
Merge branch 'trik-linux-3.6.7-code-cleanup' of https://github.com/trikset/trik-linux into trik-linux-3.6.7-code-cleanup

Conflicts:
	arch/arm/mach-davinci/board-da850-trik.c