Merge tag 'keystone_config_for_4.9' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Wed, 14 Sep 2016 21:56:11 +0000 (23:56 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 14 Sep 2016 21:56:11 +0000 (23:56 +0200)
commit35e53e33deb209a7ac83f1cfad22e60bccb66031
tree5bf1be854a7d37cab4e58714885bc69390950e0c
parentd268d2da2af6a37926b1f14c415bf9c04ad0d252
parent81b1f69e0185b1e9053ae5ce3948967ccaa29bba
Merge tag 'keystone_config_for_4.9' of git://git./linux/kernel/git/ssantosh/linux-keystone into next/defconfig

Pull "ARM: config: Add CONFIG_NOP_USB_XCEIV" from Santosh Shilimkar:

Keystone usb phy needs CONFIG_NOP_USB_XCEIV to be enabled.

* tag 'keystone_config_for_4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: keystone: defconfig: Fix USB configuration