-
Kevin Hilman authored
Merge tag 'omap-for-v4.2/o2_dc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/defconfig Few omap2plus_defconfig changes for v4.2 merge window: - Enable dm9000 as built-in for NFSroot - Enable dm816x USB phy as a loadable module - Enable Pixcir touch screen as a loadable module * tag 'omap-for-v4.2/o2_dc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: omap2plus_defconfig: Enable TOUCHSCREEN_PIXCIR ARM: omap2plus_defconfig: Add dm816x USB PHY as a loadable module ARM: omap2plus_defconifg: Enable DM9000 in omap2plus_defconfig
b3f30fb4