From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Mar 2012 23:59:10 +0000 (-0700)
Subject: Merge branch 'akpm' (Andrew's patch-bomb)
X-Git-Tag: MMI-PSA29.97-13-9~17191
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8e3ade251bc7c0a4f0777df4dd34343a03efadba;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

Merge second batch of patches from Andrew Morton:
 - various misc things
 - core kernel changes to prctl, exit, exec, init, etc.
 - kernel/watchdog.c updates
 - get_maintainer
 - MAINTAINERS
 - the backlight driver queue
 - core bitops code cleanups
 - the led driver queue
 - some core prio_tree work
 - checkpatch udpates
 - largeish crc32 update
 - a new poll() feature for the v4l guys
 - the rtc driver queue
 - fatfs
 - ptrace
 - signals
 - kmod/usermodehelper updates
 - coredump
 - procfs updates

* emailed from Andrew Morton <akpm@linux-foundation.org>: (141 commits)
  seq_file: add seq_set_overflow(), seq_overflow()
  proc-ns: use d_set_d_op() API to set dentry ops in proc_ns_instantiate().
  procfs: speed up /proc/pid/stat, statm
  procfs: add num_to_str() to speed up /proc/stat
  proc: speed up /proc/stat handling
  fs/proc/kcore.c: make get_sparsemem_vmemmap_info() static
  coredump: add VM_NODUMP, MADV_NODUMP, MADV_CLEAR_NODUMP
  coredump: remove VM_ALWAYSDUMP flag
  kmod: make __request_module() killable
  kmod: introduce call_modprobe() helper
  usermodehelper: ____call_usermodehelper() doesn't need do_exit()
  usermodehelper: kill umh_wait, renumber UMH_* constants
  usermodehelper: implement UMH_KILLABLE
  usermodehelper: introduce umh_complete(sub_info)
  usermodehelper: use UMH_WAIT_PROC consistently
  signal: zap_pid_ns_processes: s/SEND_SIG_NOINFO/SEND_SIG_FORCED/
  signal: oom_kill_task: use SEND_SIG_FORCED instead of force_sig()
  signal: cosmetic, s/from_ancestor_ns/force/ in prepare_signal() paths
  signal: give SEND_SIG_FORCED more power to beat SIGNAL_UNKILLABLE
  Hexagon: use set_current_blocked() and block_sigmask()
  ...
---

8e3ade251bc7c0a4f0777df4dd34343a03efadba
diff --cc MAINTAINERS
index ec9bcb17c572,699546996559..f47091abb8f7
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -5120,10 -5124,10 +5124,10 @@@ F:	Documentation/PCI/pci-error-recovery
  F:	Documentation/powerpc/eeh-pci-error-recovery.txt
  
  PCI SUBSYSTEM
 -M:	Jesse Barnes <jbarnes@virtuousgeek.org>
 +M:	Bjorn Helgaas <bhelgaas@google.com>
  L:	linux-pci@vger.kernel.org
  Q:	http://patchwork.kernel.org/project/linux-pci/list/
- T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git
+ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci.git
  S:	Supported
  F:	Documentation/PCI/
  F:	drivers/pci/