Merge tag 'tegra-for-3.14-defconfig-2' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Fri, 27 Dec 2013 21:11:39 +0000 (13:11 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 27 Dec 2013 21:11:39 +0000 (13:11 -0800)
commit4d77ce6c1fcae189dcd6fb0c7342f1c901b50a70
treec06cf37e40d0233250e30973e6e2d35c52c1a944
parent65f9c1312c23e5646414659797b8790d779a2445
parentcb99fd620045c0a85593d52b7b1084fa69248b5e
Merge tag 'tegra-for-3.14-defconfig-2' of git://git./linux/kernel/git/tegra/linux into next/boards

From Stephen Warren:
ARM: tegra: second set of defconfig changes

This branch contains changes to tegra_defconfig that came in after
I sent the previous pull-request/tag tegra-for-3.14-defconfig. We enable:

* DRM_PANEL/DRM_PANEL_SIMPLE, which implements the built-in LCD panel
  support for Harmony, Cardhu, and Dalmore.

This branch is based on tag tegra-for-3.14-defconfig, for which I sent a
previous pull request.

* tag 'tegra-for-3.14-defconfig-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Enable DRM panel support

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