diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-04-25 22:48:51 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2016-04-25 22:48:51 +0200 |
commit | a845167df00c10bf3e3d1a1a48472d83475e63d1 (patch) | |
tree | 0421192bce0ee7b278e2dd469263d4b93eb80d89 /security/selinux/hooks.c | |
parent | 318085c748d46888415ceb20f9c64d9e1b58c3c7 (diff) | |
parent | 8d53957c66e5cc0f1e8d33807800271d0f4fa009 (diff) |
Merge tag 'tegra-for-4.7-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt64
Merge "arm64: tegra: Changes for v4.7-rc1" from Thierry Reding
A couple of cleanups and fixes to various device trees, enable power and
volume keys on Jetson TX1, use stdout-path to define the serial port (so
it doesn't have to be specified on the kernel command-line) and add
Google Pixel C (a.k.a. Smaug) support.
* tag 'tegra-for-4.7-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
arm64: tegra: Enable cros-ec and charger on Smaug
arm64: tegra: Add pinmux for Smaug board
arm64: tegra: Add stdout-path for various boards
arm64: tegra: Remove unused #power-domain-cells property
arm64: tegra: Add gpio-keys nodes for Smaug
arm64: tegra: Enable power and volume keys on Jetson TX1
arm64: tegra: Add support for Google Pixel C
arm64: tegra: Replace legacy *,wakeup property with wakeup-source
arm64: tegra: Fix copy/paste typo in several DTS includes
arm64: tegra: Remove 0, prefix from unit-addresses
Diffstat (limited to 'security/selinux/hooks.c')
0 files changed, 0 insertions, 0 deletions