Merge branch 'platform-ti-linux-4.9.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree into ti-linux-4.9.y
TI-Feature: platform_base
TI-Tree: git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree.git
TI-Branch: platform-ti-linux-4.9.y
* 'platform-ti-linux-4.9.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree:
pinctrl: Initialize pinctrl_dev.node
pinctrl: core: Fix regression caused by delayed work for hogs
pinctrl: Drop error prints on kzalloc() failure
soc: ti: wkup_m3_ipc: Fix enable_late_halt sysfs entry
bus: da850-mstpri: fix my e-mail address
ARM: da850: add the nand dev_id to the clock lookup table
memory: aemif: allow passing device lookup table as platform data
ARM: davinci: da8xx: Fix sleeping function called from invalid context
ARM: davinci: Make __clk_{enable,disable} functions public
ARM: dts: da850-lcdk: add gpio-keys
ARM: davinci: da850: fix da850_set_pll0rate()
ARM: davinci: da850: coding style fix
ARM: davinci: da850: fix infinite loop in clk_set_rate()
ARM: davinci_all_defconfig: enable DA8xx pinconf
ARM: dts: da850: Add node for pullup/pulldown pinconf
pinctrl: da850-pupd: Add to module device table
pinctrl: New driver for TI DA850/OMAP-L138/AM18XX pinconf
devicetree: bindings: pinctrl: Add binding for ti,da850-pupd
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Conflicts:
arch/arm/mach-davinci/da850.c
