[linux] 03/03: Merge remote-tracking branch 'origin/master'

[debian-kernel at lists.debian.org]

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

ijc pushed a commit to branch master
in repository linux.

commit 5342a1ab3d3899089f615aa0e70b71746cb5cbc2
Merge: 466a4e0 67c6a4d
Author: Ian Campbell <ijc at hellion.org.uk>
Date:   Sat Jan 2 09:42:53 2016 +0000

    Merge remote-tracking branch 'origin/master'

 debian/changelog                 |  2 ++
 debian/config/armhf/config.armmp | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --cc debian/config/armhf/config.armmp
index d24eaa1,216755f..bef9ace
--- a/debian/config/armhf/config.armmp
+++ b/debian/config/armhf/config.armmp
@@@ -1132,15 -1090,11 +1138,20 @@@ CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=
  CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
  
  ##
 +## file: sound/soc/rockchip/Kconfig
 +##
 +CONFIG_SND_SOC_ROCKCHIP=m
 +CONFIG_SND_SOC_ROCKCHIP_I2S=m
 +CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
 +CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
 +CONFIG_SND_SOC_ROCKCHIP_RT5645=m
 +
 +##
+ ## file: sound/soc/sunxi/Kconfig
+ ##
+ CONFIG_SND_SUN4I_CODEC=m
+ 
+ ##
  ## file: sound/soc/tegra/Kconfig
  ##
  CONFIG_SND_SOC_TEGRA=m

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