From: Olof Johansson <olof@lixom.net>
Date: Sat, 10 Mar 2012 17:04:14 +0000 (-0800)
Subject: Merge branch 'ams-delta' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind... 
X-Git-Tag: firefly_0821_release~3680^2~3249^2~6
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1ad4fb2f7cbc21db9cdbb53e25ce348d93bbd6e7;p=firefly-linux-kernel-4.4.55.git

Merge branch 'ams-delta' of git://git./linux/kernel/git/tmlind/linux-omap into next/boards

* 'ams-delta' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ASoC: OMAP: ams-delta: drop .set_bias_level callback
  ARM: OMAP1: ams-delta: update the modem to use regulator API
  ARM: OMAP1: ams-delta: set up regulator over modem reset GPIO pin
  ARM: OMAP1: ams-delta: clean up init data section assignments
  ARM: OMAP1: ams-delta: fix incorrect section tags
---

1ad4fb2f7cbc21db9cdbb53e25ce348d93bbd6e7