Merge tag 'davinci-for-v4.15/defconfig' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Thu, 19 Oct 2017 20:43:31 +0000 (22:43 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 19 Oct 2017 20:43:31 +0000 (22:43 +0200)
commit82e3c83e23ff0d08de575e359b5eb5e50c7f894f
treef7a20005bf3213a8793b5c9f2ecdabe7be5da9e2
parent06743cbfc5e11d6af3293e4f7e5468ab83f3e369
parent5627453efabf8eef84ce1dce6767d1268570a6c5
Merge tag 'davinci-for-v4.15/defconfig' of git://git./linux/kernel/git/nsekhar/linux-davinci into next/soc

Pull "DaVinci defconfig updates for v4.15" from Sekhar Nori:

Enable CMA and MTD command line partitioning support.

* tag 'davinci-for-v4.15/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci_all_defconfig: enable CMA options
  ARM: davinci_all_defconfig: enable MTD_CMDLINE_PARTS