summaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorArnd Bergmann2012-03-04 22:21:52 +0100
committerArnd Bergmann2012-03-04 22:22:33 +0100
commit2eed4e7d8631d8404fdef9c09d26a48376186ad1 (patch)
treee3f85a5f6e0d643216b1d8994dc023fc4e0c0b2b /net/nfc
parentMerge branch 'features/imx31-moboard' of git://git.pengutronix.de/git/imx/lin... (diff)
parentARM: tegra: match SoC name not board name in DT board files (diff)
downloadkernel-qcow2-linux-2eed4e7d8631d8404fdef9c09d26a48376186ad1.tar.gz
kernel-qcow2-linux-2eed4e7d8631d8404fdef9c09d26a48376186ad1.tar.xz
kernel-qcow2-linux-2eed4e7d8631d8404fdef9c09d26a48376186ad1.zip
Merge tag 'tegra-boards' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/boards
Tegra board updates. Most of the board updates for tegra30 and for some of the driver device-tree conversions have gone in through the other branches, so that leaves quite little left here -- mostly a couple of updates to the not-yet-converted tegra2 boards and a couple of device-tree updates. * tag 'tegra-boards' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra: ARM: tegra: match SoC name not board name in DT board files ARM: tegra: PCIe: Provide 3.3V supply voltage ARM: dt: tegra: add the wifi led to paz00 device tree ARM: dt: tegra: add the power gpio key to paz00 device tree ARM: dt: tegra: add ADT7461 temperature sensor to paz00 device tree Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'net/nfc')
0 files changed, 0 insertions, 0 deletions