[linux] 08/08: Merge branch 'master' of git+ssh://git.debian.org/git/kernel/linux

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 8bef69e784d934d1a0d6f091ef52f011426e1f5b
Merge: 0ad3270 65aec29
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Jun 13 02:08:57 2016 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/kernel/linux

 debian/changelog           | 10 ++++++++++
 debian/config/arm64/config | 36 +++++++++++++++++++++++++++++++++++-
 debian/config/armhf/config | 18 ++++++++++++++++++
 3 files changed, 63 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 1565a8c,608b935..9dbcdf8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -12,14 -12,17 +12,24 @@@ linux (4.7~rc2-1~exp1) UNRELEASED; urge
      later be signed
    * [rt] Disable until it is updated for 4.7 or later
    * cpupower: Bump soname version and rename library package accordingly
 +  * debian/rules.d/Makefile: Override architecture detection when building
 +    userland headers
 +  * linux-cpupower: Define PACKAGE_BUGREPORT to refer to reportbug, not upstream
 +  * debian/README.source: Document the supported build profiles
 +  * debian/control: Fix build-dependencies for cross-building
 +  * Add support for the nopython build profile, disabling the linux-perf package
 +  * Fix build rules for userland tools to support cross-building
  
+   [ Martin Michlmayr ]
+   * [armhf, arm64] Enable PHY_TEGRA_XUSB and USB_XHCI_TEGRA.
+   * [arm64] Enable MAX77620 and PCA9539 which are required by Jetson TX1.
+   * [arm64] Enable TEGRA210_ADMA.
+   * [arm64] Enable THERMAL.
+   * [armhf] Enable TEGRA_SOCTHERM.
+   * [armhf] Enable SPI_TEGRA114.
+   * [arm64] Enable more QCOM options (QCOM_SMP2P, QCOM_SMSM, QCOM_WCNSS_CTRL,
+     PHY_QCOM_UFS, QCOM_QFPROM).
+ 
   -- Ben Hutchings <ben at decadent.org.uk>  Tue, 07 Jun 2016 19:37:55 +0100
  
  linux (4.6.1-1) unstable; urgency=medium

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git