diff options
| author | 2015-02-12 18:54:28 -0800 | |
|---|---|---|
| committer | 2015-02-12 18:54:28 -0800 | |
| commit | 818099574b04c5301eacbbcd441022b353a65466 (patch) | |
| tree | 77b3645b375105cb0389df2b4ea5ffa90329f7f8 /lib/test-string_helpers.c | |
| parent | Merge tag 'dm-3.20-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm (diff) | |
| parent | lib/lcm.c: replace include (diff) | |
| download | linux-dev-818099574b04c5301eacbbcd441022b353a65466.tar.xz linux-dev-818099574b04c5301eacbbcd441022b353a65466.zip | |
Merge branch 'akpm' (patches from Andrew)
Merge third set of updates from Andrew Morton:
 - the rest of MM
   [ This includes getting rid of the numa hinting bits, in favor of
     just generic protnone logic.  Yay.     - Linus ]
 - core kernel
 - procfs
 - some of lib/ (lots of lib/ material this time)
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (104 commits)
  lib/lcm.c: replace include
  lib/percpu_ida.c: remove redundant includes
  lib/strncpy_from_user.c: replace module.h include
  lib/stmp_device.c: replace module.h include
  lib/sort.c: move include inside #if 0
  lib/show_mem.c: remove redundant include
  lib/radix-tree.c: change to simpler include
  lib/plist.c: remove redundant include
  lib/nlattr.c: remove redundant include
  lib/kobject_uevent.c: remove redundant include
  lib/llist.c: remove redundant include
  lib/md5.c: simplify include
  lib/list_sort.c: rearrange includes
  lib/genalloc.c: remove redundant include
  lib/idr.c: remove redundant include
  lib/halfmd4.c: simplify includes
  lib/dynamic_queue_limits.c: simplify includes
  lib/sort.c: use simpler includes
  lib/interval_tree.c: simplify includes
  hexdump: make it return number of bytes placed in buffer
  ...
Diffstat (limited to 'lib/test-string_helpers.c')
0 files changed, 0 insertions, 0 deletions
