summaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorOlof Johansson2012-03-10 18:04:14 +0100
committerOlof Johansson2012-03-10 18:04:14 +0100
commit1ad4fb2f7cbc21db9cdbb53e25ce348d93bbd6e7 (patch)
treeab448afc1422107919c832cf916a39c20efc77d3 /net/nfc
parentMerge tag 'tegra-boards' of git://git.kernel.org/pub/scm/linux/kernel/git/olo... (diff)
parentASoC: OMAP: ams-delta: drop .set_bias_level callback (diff)
downloadkernel-qcow2-linux-1ad4fb2f7cbc21db9cdbb53e25ce348d93bbd6e7.tar.gz
kernel-qcow2-linux-1ad4fb2f7cbc21db9cdbb53e25ce348d93bbd6e7.tar.xz
kernel-qcow2-linux-1ad4fb2f7cbc21db9cdbb53e25ce348d93bbd6e7.zip
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 'net/nfc')
0 files changed, 0 insertions, 0 deletions