diff options
| author | Olof Johansson <olof@lixom.net> | 2013-12-27 16:11:39 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-12-27 16:11:39 -0500 |
| commit | 4d77ce6c1fcae189dcd6fb0c7342f1c901b50a70 (patch) | |
| tree | c06cf37e40d0233250e30973e6e2d35c52c1a944 /security/selinux/hooks.c | |
| parent | 65f9c1312c23e5646414659797b8790d779a2445 (diff) | |
| parent | cb99fd620045c0a85593d52b7b1084fa69248b5e (diff) | |
Merge tag 'tegra-for-3.14-defconfig-2' of git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'security/selinux/hooks.c')
0 files changed, 0 insertions, 0 deletions