[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-10 22:54:09
Message-ID: S27013476AbbLJWyLsiCel/20151210225411Z+2139 () eddie ! linux-mips ! org
[Download RAW message or body]

Author: Ralf Baechle <ralf@linux-mips.org> Thu Dec 10 23:53:48 2015 +0100
Commit: 30a1e2d128c29ce7b8c9728c699e849d12b31591
Gitweb: http://git.linux-mips.org/g/ralf/linux/30a1e2d128c2
Branch: master

---

 MAINTAINERS                                  |    2 
 arch/blackfin/kernel/perf_event.c            |    2 
 arch/sh/kernel/perf_event.c                  |    2 
 arch/sparc/kernel/perf_event.c               |    2 
 arch/tile/kernel/perf_event.c                |    2 
 arch/um/Makefile                             |    2 
 arch/um/drivers/net_user.c                   |   10 +
 arch/um/kernel/signal.c                      |    2 
 arch/x86/kernel/cpu/perf_event.c             |    2 
 arch/x86/kernel/cpu/perf_event.h             |    5 -
 arch/x86/kernel/cpu/perf_event_intel.c       |    2 
 arch/x86/kernel/cpu/perf_event_intel_cqm.c   |    2 
 arch/x86/kernel/cpu/perf_event_intel_lbr.c   |    4 -
 arch/x86/kernel/irq_work.c                   |    2 
 arch/x86/um/signal.c                         |   18 +-
 block/blk-cgroup.c                           |    6 -
 drivers/ata/ahci.c                           |   22 ++-
 drivers/ata/ahci_mvebu.c                     |    5 +
 drivers/ata/libahci.c                        |    9 +
 drivers/ata/libata-eh.c                      |    8 +
 drivers/ata/sata_fsl.c                       |    3 
 drivers/ata/sata_sil.c                       |    3 
 drivers/char/ipmi/ipmi_si_intf.c             |    8 +
 drivers/clk/clk-gpio.c                       |   33 ++---
 drivers/clk/clk-qoriq.c                      |    4 -
 drivers/clk/clk-scpi.c                       |    1 
 drivers/clk/imx/clk-pllv1.c                  |   14 +-
 drivers/clk/imx/clk-pllv2.c                  |    9 +
 drivers/clk/mmp/clk-mmp2.c                   |    1 
 drivers/clk/mmp/clk-pxa168.c                 |    1 
 drivers/clk/mmp/clk-pxa910.c                 |    1 
 drivers/clk/sunxi/clk-a10-pll2.c             |   23 +--
 drivers/clk/ti/clk-816x.c                    |    2 
 drivers/clk/ti/clkt_dpll.c                   |    4 -
 drivers/clk/ti/divider.c                     |   16 --
 drivers/clk/ti/fapll.c                       |    4 -
 drivers/clk/ti/mux.c                         |   15 --
 drivers/of/address.c                         |    5 -
 drivers/of/fdt.c                             |    7 +
 drivers/of/irq.c                             |    3 
 drivers/of/of_reserved_mem.c                 |    8 +
 drivers/pci/host/pcie-altera.c               |   23 ++-
 drivers/pci/msi.c                            |    4 -
 drivers/vfio/Kconfig                         |   15 --
 drivers/vfio/pci/vfio_pci.c                  |   10 +
 drivers/vfio/platform/vfio_platform.c        |    1 
 drivers/vfio/platform/vfio_platform_common.c |    5 -
 drivers/vfio/vfio.c                          |  188 +-------------------------
 fs/9p/vfs_inode.c                            |    4 -
 fs/direct-io.c                               |    1 
 include/asm-generic/tlb.h                    |    2 
 include/linux/bitops.h                       |    2 
 include/linux/cgroup-defs.h                  |   13 --
 include/linux/cgroup.h                       |   47 +++----
 include/linux/jump_label.h                   |    2 
 include/linux/libata.h                       |    1 
 include/linux/lockdep.h                      |    2 
 include/linux/of_irq.h                       |   19 ++-
 include/linux/perf_event.h                   |    6 +
 include/linux/proportions.h                  |    2 
 include/linux/uprobes.h                      |    2 
 include/linux/vfio.h                         |    3 
 include/sound/hda_register.h                 |    3 
 include/uapi/linux/vfio.h                    |    7 -
 kernel/cgroup.c                              |   99 +++++++++++---
 kernel/cgroup_freezer.c                      |   23 +--
 kernel/cgroup_pids.c                         |   77 +++--------
 kernel/cpuset.c                              |   33 +++--
 kernel/events/callchain.c                    |    2 
 kernel/events/core.c                         |   90 +++++++++---
 kernel/events/ring_buffer.c                  |    2 
 kernel/events/uprobes.c                      |    2 
 kernel/fork.c                                |    9 -
 kernel/irq_work.c                            |    2 
 kernel/jump_label.c                          |    2 
 kernel/locking/lockdep.c                     |    2 
 kernel/locking/lockdep_proc.c                |    2 
 kernel/sched/clock.c                         |    2 
 kernel/sched/core.c                          |   12 +-
 kernel/sched/fair.c                          |    2 
 kernel/trace/trace_event_perf.c              |    2 
 lib/btree.c                                  |    2 
 lib/proportions.c                            |    2 
 mm/memcontrol.c                              |   45 +++---
 mm/page-writeback.c                          |    2 
 net/core/netclassid_cgroup.c                 |    6 +
 net/core/netprio_cgroup.c                    |    9 +
 scripts/link-vmlinux.sh                      |    2 
 sound/pci/hda/hda_intel.c                    |   23 +++
 sound/pci/hda/patch_ca0132.c                 |    3 
 sound/pci/hda/patch_realtek.c                |   32 ++++
 sound/pci/rme96.c                            |   41 ++++--
 92 files changed, 566 insertions(+), 600 deletions(-)

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