tree f573761ac752ff04ec445e23aef50adadda49790
parent aca6ad073ea820776bf5bdb87cf82eace35042c8
parent 790ab7e92bec24aee3939b300d36b99ab2e3f3ca
author Tony Lindgren <tony@atomide.com> 1299114434 -0800
committer Tony Lindgren <tony@atomide.com> 1299114434 -0800

Merge branch 'devel-cleanup' into omap-for-linus

Conflicts:
	arch/arm/mach-omap2/timer-gp.c