Merge branches 'devel-fixes', 'devel-cleanup' and 'devel-genirq' into for-next
authorTony Lindgren <tony@atomide.com>
Tue, 17 May 2011 10:44:50 +0000 (03:44 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 17 May 2011 10:44:50 +0000 (03:44 -0700)
commitb08827f4c7a5020855abe0f9b1a316f11275b76b
tree11f364b899b17e5bf82169a710ac8a480ff4fa96
parent75c0b3b466388f2fad60fda57b6ca2c4fabbcaf7
parent5fd2a84ab3c8b87176e25db1d98c5cc34043a669
parent7be13ad0ce518c03cf4852f69e8a9746be2edb03
parent667a11facee70c0bd15cf07946fba71236490e07
Merge branches 'devel-fixes', 'devel-cleanup' and 'devel-genirq' into for-next
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/omap_l3_smx.c
arch/arm/mach-omap2/voltage.c