[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-03-13 12:12:27
Message-ID: S27013658AbbCMMMa18eQe/20150313121230Z+3969 () eddie ! linux-mips ! org
[Download RAW message or body]

Author: Ralf Baechle <ralf@linux-mips.org> Fri Mar 13 12:20:55 2015 +0100
Commit: b2ac7131e2483f1d3b88f94108245eab4941277c
Gitweb: http://git.linux-mips.org/g/ralf/linux/b2ac7131e248
Branch: master

---

 arch/c6x/include/asm/pgtable.h           |    5 +++
 arch/microblaze/kernel/entry.S           |    7 ++--
 arch/nios2/include/asm/ptrace.h          |   47 ++++++++++++++++++++++++++++
 arch/nios2/include/asm/ucontext.h        |   32 -------------------
 arch/nios2/include/uapi/asm/Kbuild       |    2 +
 arch/nios2/include/uapi/asm/elf.h        |    4 +-
 arch/nios2/include/uapi/asm/ptrace.h     |   50 ++----------------------------
 arch/nios2/include/uapi/asm/sigcontext.h |   12 ++++---
 arch/nios2/kernel/signal.c               |    4 +-
 drivers/i2c/i2c-core.c                   |    3 --
 drivers/pci/host/pci-xgene.c             |    4 +-
 drivers/pci/pci-sysfs.c                  |    5 ++-
 drivers/rtc/rtc-s3c.c                    |    1 +
 fs/nilfs2/segment.c                      |    7 ++--
 fs/notify/fanotify/fanotify.c            |    3 +-
 fs/ocfs2/ocfs2.h                         |    2 +
 fs/ocfs2/ocfs2_fs.h                      |   15 +++++----
 include/linux/kasan.h                    |    9 ++---
 include/linux/moduleloader.h             |    8 +++++
 include/linux/vmalloc.h                  |    1 +
 kernel/module.c                          |    2 -
 mm/cma.c                                 |   12 ++++---
 mm/huge_memory.c                         |   11 +++++--
 mm/hugetlb.c                             |    4 ++
 mm/kasan/kasan.c                         |   14 +++++++-
 mm/memcontrol.c                          |    4 ++
 mm/memory.c                              |    7 ++++
 mm/mlock.c                               |    4 +-
 mm/nommu.c                               |    1 +
 mm/page_alloc.c                          |    3 +-
 mm/vmalloc.c                             |    1 +
 31 files changed, 148 insertions(+), 136 deletions(-)

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