projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 662cfed 4cbb083)
Merge tag 'omap-for-v4.2/o2_dc' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorKevin Hilman <khilman@linaro.org>
Thu, 11 Jun 2015 23:32:56 +0000 (16:32 -0700)
committerKevin Hilman <khilman@linaro.org>
Thu, 11 Jun 2015 23:33:20 +0000 (16:33 -0700)
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

1  2 
arch/arm/configs/omap2plus_defconfig patch | diff1 | diff2 | blob | history

diff --cc arch/arm/configs/omap2plus_defconfig
Simple merge
Unnamed repository; edit this file 'description' to name the repository.