Commit a2a2609c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (Andrew's patch-bomb) 

* emailed from Andrew Morton <akpm@linux-foundation.org>: (21 patches)
  mm/memblock: fix overlapping allocation when doubling reserved array
  c/r: prctl: Move PR_GET_TID_ADDRESS to a proper place
  pidns: find_new_reaper() can no longer switch to init_pid_ns.child_reaper
  pidns: guarantee that the pidns init will be the last pidns process reaped
  fault-inject: avoid call to random32() if fault injection is disabled
  Viresh has moved
  get_maintainer: Fix --help warning
  mm/memory.c: fix kernel-doc warnings
  mm: fix kernel-doc warnings
  mm: correctly synchronize rss-counters at exit/exec
  mm, thp: print useful information when mmap_sem is unlocked in zap_pmd_range
  h8300: use the declarations provided by <asm/sections.h>
  h8300: fix use of extinct _sbss and _ebss
  xtensa: use the declarations provided by <asm/sections.h>
  xtensa: use "test -e" instead of bashism "test -a"
  xtensa: replace xtensa-specific _f{data,text} by _s{data,text}
  memcg: fix use_hierarchy css_is_ancestor oops regression
  mm, oom: fix and cleanup oom score calculations
  nilfs2: ensure proper cache clearing for gc-inodes
  thp: avoid atomic64_read in pmd_read_atomic for 32bit PAE
  ...
parents a4d7a122 48c3b583

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> 
Uwe Kleine-König <ukl@pengutronix.de>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Viresh Kumar <viresh.linux@gmail.com> <viresh.kumar@st.com>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Yusuke Goda <goda.yusuke@renesas.com>

Gustavo Padovan <gustavo@las.ic.unicamp.br>

Documentation/arm/SPEAr/overview.txt

+1 −1
Original line number Diff line number Diff line
@@ -60,4 +60,4 @@ Introduction 
  Document Author

  ---------------



  Viresh Kumar <viresh.kumar@st.com>, (c) 2010-2012 ST Microelectronics
 
  Viresh Kumar <viresh.linux@gmail.com>, (c) 2010-2012 ST Microelectronics

MAINTAINERS

+9 −9
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ F: drivers/net/appletalk/ 
F:	net/appletalk/



ARASAN COMPACT FLASH PATA CONTROLLER

M:	Viresh Kumar <viresh.kumar@st.com>

M:     Viresh Kumar <viresh.linux@gmail.com>

L:	linux-ide@vger.kernel.org

S:	Maintained

F:	include/linux/pata_arasan_cf_data.h
@@ -5296,7 +5296,7 @@ S: Maintained 
F:	drivers/pinctrl/



PIN CONTROLLER - ST SPEAR

M:	Viresh Kumar <viresh.kumar@st.com>

M:     Viresh Kumar <viresh.linux@gmail.com>

L:	spear-devel@list.st.com

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://www.st.com/spear
@@ -5873,7 +5873,7 @@ S: Maintained 
F:	drivers/tty/serial



SYNOPSYS DESIGNWARE DMAC DRIVER

M:	Viresh Kumar <viresh.kumar@st.com>

M:     Viresh Kumar <viresh.linux@gmail.com>

S:	Maintained

F:	include/linux/dw_dmac.h

F:	drivers/dma/dw_dmac_regs.h
@@ -6021,7 +6021,7 @@ S: Maintained 
F:	drivers/mmc/host/sdhci-s3c.c



SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) ST SPEAR DRIVER

M:	Viresh Kumar <viresh.kumar@st.com>

M:     Viresh Kumar <viresh.linux@gmail.com>

L:	spear-devel@list.st.com

L:	linux-mmc@vger.kernel.org

S:	Maintained
@@ -6377,7 +6377,7 @@ S: Maintained 
F:	include/linux/compiler.h



SPEAR PLATFORM SUPPORT

M:	Viresh Kumar <viresh.kumar@st.com>

M:     Viresh Kumar <viresh.linux@gmail.com>

M:	Shiraz Hashim <shiraz.hashim@st.com>

L:	spear-devel@list.st.com

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -6386,7 +6386,7 @@ S: Maintained 
F:	arch/arm/plat-spear/



SPEAR13XX MACHINE SUPPORT

M:	Viresh Kumar <viresh.kumar@st.com>

M:     Viresh Kumar <viresh.linux@gmail.com>

M:	Shiraz Hashim <shiraz.hashim@st.com>

L:	spear-devel@list.st.com

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -6395,7 +6395,7 @@ S: Maintained 
F:	arch/arm/mach-spear13xx/



SPEAR3XX MACHINE SUPPORT

M:	Viresh Kumar <viresh.kumar@st.com>

M:     Viresh Kumar <viresh.linux@gmail.com>

M:	Shiraz Hashim <shiraz.hashim@st.com>

L:	spear-devel@list.st.com

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -6406,7 +6406,7 @@ F: arch/arm/mach-spear3xx/ 
SPEAR6XX MACHINE SUPPORT

M:	Rajeev Kumar <rajeev-dlh.kumar@st.com>

M:	Shiraz Hashim <shiraz.hashim@st.com>

M:	Viresh Kumar <viresh.kumar@st.com>

M:     Viresh Kumar <viresh.linux@gmail.com>

L:	spear-devel@list.st.com

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://www.st.com/spear
@@ -6414,7 +6414,7 @@ S: Maintained 
F:	arch/arm/mach-spear6xx/



SPEAR CLOCK FRAMEWORK SUPPORT

M:	Viresh Kumar <viresh.kumar@st.com>

M:     Viresh Kumar <viresh.linux@gmail.com>

L:	spear-devel@list.st.com

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://www.st.com/spear

arch/arm/boot/dts/spear1310-evb.dts

+1 −1
Original line number Diff line number Diff line 
/*

 * DTS file for SPEAr1310 Evaluation Baord

 *

 * Copyright 2012 Viresh Kumar <viresh.kumar@st.com>

 * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com>

 *

 * The code contained herein is licensed under the GNU General Public

 * License. You may obtain a copy of the GNU General Public License

arch/arm/boot/dts/spear1310.dtsi

+1 −1
Original line number Diff line number Diff line 
/*

 * DTS file for all SPEAr1310 SoCs

 *

 * Copyright 2012 Viresh Kumar <viresh.kumar@st.com>

 * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com>

 *

 * The code contained herein is licensed under the GNU General Public

 * License. You may obtain a copy of the GNU General Public License

CRA Git | Maintained and supported by SUSTech CRA and CCSE