summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/voltage.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-05-17 03:44:50 -0700
committerTony Lindgren <tony@atomide.com>2011-05-17 03:44:50 -0700
commitb08827f4c7a5020855abe0f9b1a316f11275b76b (patch)
tree11f364b899b17e5bf82169a710ac8a480ff4fa96 /arch/arm/mach-omap2/voltage.c
parent75c0b3b466388f2fad60fda57b6ca2c4fabbcaf7 (diff)
parent5fd2a84ab3c8b87176e25db1d98c5cc34043a669 (diff)
parent7be13ad0ce518c03cf4852f69e8a9746be2edb03 (diff)
parent667a11facee70c0bd15cf07946fba71236490e07 (diff)
Merge branches 'devel-fixes', 'devel-cleanup' and 'devel-genirq' into for-next