summaryrefslogtreecommitdiffstats
path: root/drivers/nfc/st-nci
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2015-08-11 16:08:04 +0200
committerLee Jones <lee.jones@linaro.org>2015-08-11 16:08:04 +0200
commitd548ca43d0333a0c4af0c79e9e6aafc29cd5a854 (patch)
tree46f4f59d7f0011b953a63ef65df3735f7aef2548 /drivers/nfc/st-nci
parentmfd: Add support for Intel Sunrisepoint LPSS devices (diff)
parentMAINTAINERS: Add the LPC Clocksource to STi maintained driver list (diff)
parentwatchdog: iTCO_wdt: Add support for TCO on Intel Sunrisepoint (diff)
downloadlinux-d548ca43d0333a0c4af0c79e9e6aafc29cd5a854.tar.xz
linux-d548ca43d0333a0c4af0c79e9e6aafc29cd5a854.zip
Merge branches 'ib-mfd-base-acpi-dma-4.3', 'ib-mfd-clocksource-rtc-watchdog-4.3' and 'ib-mfd-i2c-x86-watchdog-4.3' into ibs-for-mfd-merged