linux-next: manual merge of the pinctrl tree with the driver-core.current tree

Hi Linus, Today's linux-next merge of the pinctrl tree got a conflict in drivers/pinctrl/pinctrl-nomadik.c between commit c2c57b329c7b ("Drivers: pinctrl: remove __dev* attributes") from the driver-core.current tree and commit f7ae849b80de ("pinctrl/nomadik: adopt pinctrl sleep mode management") f

linux-next: manual merge of the pinctrl tree with the driver-core.current tree

Hi Linus, Today's linux-next merge of the pinctrl tree got a conflict in drivers/pinctrl/pinctrl-sirf.c between commit c2c57b329c7b ("Drivers: pinctrl: remove __dev* attributes") from the driver-core.current tree and commit 19d601d8e0a7 ("pinctrl: sirf: enable GPIO pullup/down configuration from d