tree 1764076e0dfaa33fd8da9e6cb1dce846fb0163ed
parent 51271cecc925ceac3ea6d8ebf63884226eb13c50
parent 697549cdd637841e7c88d0014fe25dfbb72565de
author Olof Johansson <olof@lixom.net> 1422049615 -0800
committer Olof Johansson <olof@lixom.net> 1422049615 -0800
mergetag object 697549cdd637841e7c88d0014fe25dfbb72565de
 type commit
 tag omap-for-v3.20/defconfig-modular
 tagger Tony Lindgren <tony@atomide.com> 1421776522 -0800
 
 Defconfig changes for omap2plus_defconfig to make it more modular,
 and to add few more drivers found on various boards.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUvpayAAoJEBvUPslcq6Vz0uMQANmhwxJhXph/nU3yV3r7yo1M
 1jeNuhfs0OFnlpC2go8XFkdggrmRaqQuo73JFegrZAfoDAJOTn+WQ2k9l+zc2wS/
 0Kv+L1/RytjNSeZVwmJYm2KCTRr3pemw2Cjx42OkQCqDPWexADwkM7IkcoCNjYHX
 cBVOVHORvw4fR621gEa/JxZ6EkYunPyGJvvMR9AfrZ3qgEBZf7hbwXQ6RKfnk/mq
 wC4eoC/GvZYaeM7/dLhOv6SVgHd/uBfAqjfUBwBM51Tsp08Ot0prykwggSbt+SUu
 x2FBMC/pCKPnnisQh3DvbYRdIDZ3rQdgXZ0+crlNm5oWviYzZq5QeGbYtp0eAfO9
 a79TomBZ6HxyZn6V0uYfgj6xdqB58Nce9FP/7e6bKpaiR+ckM7xNXU/VE4sfIKtE
 gmkc3Gd7ReGlMABnS7yZrsCK2/xFKZxV9XSg+DECkjBGfSdEtjbnvVvUxoUQ2gMg
 32ehuaZ1qQpD3aMWJJLXZQLSOZKqEyPNdM30WuMvwKgfn4z3UlxiMUqjY2h5VIqV
 nS/b2v6XLw6W/eAZ4mslzClGH6MlkVOpXGbeKajXBTIoFXs7uVMUc+dAxu3qhXPV
 coA/GS8gj1ors71m5V7/83tz0JDrjWlWR3a09qZQGMKE76JBUuEA58gk1uOGYFDn
 ijucX7zpZY/+Epr/+zuQ
 =v4Ba
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v3.20/defconfig-modular' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/defconfig

Merge "omap defconfig changes for v3.20" from Tony Lindgren:

Defconfig changes for omap2plus_defconfig to make it more modular,
and to add few more drivers found on various boards.

* tag 'omap-for-v3.20/defconfig-modular' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: omap2plus_defconfig: Enable OHCI & EHCI HCD support
  ARM: omap2plus_defconfig: Enable misc options for BeagleBoard-X15 platform
  ARM: omap2plus_defconfig: Enable pcf857x
  ARM: omap2plus_defconfig: Add NOR flash support
  ARM: omap2plus_defconfig: Enable support for davinci_emac
  ARM: omap2plus_defconfig: enable TPS65218 power button
  ARM: omap2plus_defconfig: reduce zImage size on omap2plus_defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>