[linux] 07/07: Merge remote-tracking branch 'alioth/master'

[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 868f3e2704c1a83ec8a03f365a97e0c6f3ab304c
Merge: 900fda3 2092e55
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Tue Nov 10 13:52:46 2015 +0000

    Merge remote-tracking branch 'alioth/master'

 debian/changelog                   |  6 ++++++
 debian/config/armel/config.orion5x | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --cc debian/changelog
index 231dc77,abb4aca..beb93c2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,14 +1,21 @@@
  linux (4.3-1~exp2) UNRELEASED; urgency=medium
  
+   [ Ben Hutchings ]
    * qxl: Enable by default (Closes: #779515)
    * mv643xx_eth: Re-enable TSO, fixed upstream in 4.3
 +  * debian/control: Move patchutils from Build-Depends to Build-Depends-Indep,
 +    as we only use filterdiff when building linux-source-<version>
 +  * debian/control,debian/rules: Support a 'stage1' build profile which
 +    builds only linux-libc-dev (Closes: #695243)
 +  * debian/control: Add ':any' to Build-Depends on python3, to support cross-
 +    bootstrap
 +  * [s390*] Update linux-compiler metapackage to gcc-4.9
  
+   [ Ian Campbell ]
+   * [armel/orion5x] Enable Device Tree for orion5x. Patch from Roger Shimizu
+     (Closes: #803159)
+   * [armel/orion5x] Enable CONFIG_DEBUG_LL_UART_8250.
+ 
   -- Ben Hutchings <ben at decadent.org.uk>  Sat, 07 Nov 2015 14:18:48 +0000
  
  linux (4.3-1~exp1) experimental; urgency=medium

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