Linus Walleij 7f36f5d11c Merge tag 'v4.10-rc6' into devel ...

Linux 4.10-rc6

Resolved conflicts in:
	drivers/pinctrl/pinctrl-amd.c
	drivers/pinctrl/samsung/pinctrl-exynos.c

2017-01-30 14:39:20 +01:00

..

consumer.h

…

driver.h

Merge tag 'v4.10-rc6' into devel

2017-01-30 14:39:20 +01:00

machine.h

…