diff options
author | Olof Johansson <olof@lixom.net> | 2012-03-10 09:04:14 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-03-10 09:04:14 -0800 |
commit | 1ad4fb2f7cbc21db9cdbb53e25ce348d93bbd6e7 (patch) | |
tree | ab448afc1422107919c832cf916a39c20efc77d3 /arch/arm/mach-nomadik/cpu-8815.c | |
parent | 2eed4e7d8631d8404fdef9c09d26a48376186ad1 (diff) | |
parent | 0379c1f55b734d9d112f535e12f4508b90a1bab1 (diff) |
Merge branch 'ams-delta' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'arch/arm/mach-nomadik/cpu-8815.c')
0 files changed, 0 insertions, 0 deletions