Merge branch 'omap1' into ams-delta
authorTony Lindgren <tony@atomide.com>
Thu, 1 Mar 2012 23:20:00 +0000 (15:20 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 1 Mar 2012 23:20:00 +0000 (15:20 -0800)
commit42392762149cba0a74c1c5b1b1bb868d86e62383
tree3be8e3cbb4f09749a2e51d1fa162afd2181e19e6
parent6b21d18ed50c7d145220b0724ea7f2613abf0f95
parent967809bd7faf71ddc29c8081e0f21db8b201a0f4
Merge branch 'omap1' into ams-delta
drivers/leds/Kconfig
drivers/leds/Makefile