Merge branch 'omap1-part2' into omap1
authorTony Lindgren <tony@atomide.com>
Fri, 20 Jan 2012 13:31:52 +0000 (05:31 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 20 Jan 2012 13:31:52 +0000 (05:31 -0800)
Conflicts:
drivers/leds/leds-ams-delta.c


Trivial merge