From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Tue, 27 Mar 2012 19:16:14 +0000 (-0400)
Subject: Merge commit 'e22057c8599373e5caef0bc42bdb95d2a361ab0d' into linux-next
X-Git-Tag: next-20120402~11^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9c9fc31d65250b25459c83da739dccbc2c264038;p=karo-tx-linux.git

Merge commit 'e22057c8599373e5caef0bc42bdb95d2a361ab0d' into linux-next

* commit 'e22057c8599373e5caef0bc42bdb95d2a361ab0d': (6661 commits)
  Fix potential endless loop in kswapd when compaction is not enabled
  xen/acpi: Fix Kconfig dependency on CPU_FREQ
  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
  ...

Conflicts:
	mm/swapfile.c
---

9c9fc31d65250b25459c83da739dccbc2c264038