[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-mips-cvs
Subject:    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
From:       linux-mips () linux-mips ! org
Date:       2015-12-05 10:47:19
Message-ID: S27010650AbbLEKrVUd8Ht/20151205104721Z+290 () eddie ! linux-mips ! org
[Download RAW message or body]

Author: Ralf Baechle <ralf@linux-mips.org> Sat Dec 5 11:45:48 2015 +0100
Commit: 7a88840a275c26292b8f4ea8ae44f8e8e85186fb
Gitweb: http://git.linux-mips.org/g/ralf/linux/7a88840a275c
Branch: master

---

 MAINTAINERS                            |    2 -
 arch/arm/include/asm/kvm_emulate.h     |   12 +++
 arch/arm/kvm/mmio.c                    |    5 +
 arch/arm/kvm/mmu.c                     |    4 +
 arch/arm/kvm/psci.c                    |   20 +++--
 arch/arm64/include/asm/kvm_emulate.h   |   18 +++--
 arch/arm64/kvm/handle_exit.c           |    2 -
 arch/arm64/kvm/sys_regs.c              |  123 ++++++++++++++++----------------
 arch/arm64/kvm/sys_regs.h              |    8 +-
 arch/arm64/kvm/sys_regs_generic_v8.c   |    4 +
 arch/x86/kernel/pmem.c                 |   12 +++
 arch/x86/pci/bus_numa.c                |   13 +--
 drivers/acpi/Kconfig                   |    4 +
 drivers/acpi/nfit.c                    |   65 ++++++++++++-----
 drivers/acpi/nfit.h                    |    3 +
 drivers/acpi/pci_root.c                |    7 ++
 drivers/base/power/domain.c            |    3 -
 drivers/base/power/domain_governor.c   |    3 -
 drivers/block/rbd.c                    |    1 
 drivers/cpufreq/cpufreq.c              |   14 +++-
 drivers/pci/pci-driver.c               |   16 ++++
 include/linux/acpi.h                   |    4 +
 include/linux/cpufreq.h                |    1 
 include/sound/soc-dapm.h               |    1 
 sound/pci/hda/patch_conexant.c         |    5 +
 sound/pci/hda/patch_hdmi.c             |    6 ++
 sound/soc/codecs/arizona.c             |   16 +---
 sound/soc/codecs/es8328.c              |   16 ++--
 sound/soc/codecs/nau8825.c             |   31 ++++++++
 sound/soc/codecs/rl6231.c              |    6 +-
 sound/soc/codecs/rt5645.c              |   61 +++++++++++++++-
 sound/soc/codecs/rt5670.h              |   12 ++-
 sound/soc/codecs/rt5677.c              |  100 ++++++++++++++++----------
 sound/soc/codecs/wm8960.c              |    2 -
 sound/soc/codecs/wm8962.c              |    4 +
 sound/soc/davinci/davinci-mcasp.c      |   12 +++
 sound/soc/fsl/Kconfig                  |    2 +
 sound/soc/fsl/fsl_sai.c                |    3 +
 sound/soc/intel/Kconfig                |    2 -
 sound/soc/intel/skylake/skl-topology.c |    1 
 sound/soc/rockchip/rockchip_spdif.c    |    2 -
 sound/soc/rockchip/rockchip_spdif.h    |    6 +-
 sound/soc/sh/rcar/gen.c                |    2 -
 sound/soc/sh/rcar/src.c                |    7 ++
 sound/soc/soc-core.c                   |    6 +-
 sound/soc/soc-dapm.c                   |    7 ++
 sound/soc/soc-ops.c                    |    2 -
 sound/soc/soc-topology.c               |    3 +
 sound/soc/sti/uniperif_player.c        |    9 ++
 sound/soc/sti/uniperif_reader.c        |    3 -
 sound/soc/sunxi/sun4i-codec.c          |   27 ++++---
 tools/testing/nvdimm/test/nfit.c       |   49 ++++---------
 52 files changed, 471 insertions(+), 276 deletions(-)

[prev in list] [next in list] [prev in thread] [next in thread]