Linus Torvalds 814a2bf957 Merge branch 'akpm' (patches from Andrew)
Merge second patch-bomb from Andrew Morton:

 - a couple of hotfixes

 - the rest of MM

 - a new timer slack control in procfs

 - a couple of procfs fixes

 - a few misc things

 - some printk tweaks

 - lib/ updates, notably to radix-tree.

 - add my and Nick Piggin's old userspace radix-tree test harness to
   tools/testing/radix-tree/.  Matthew said it was a godsend during the
   radix-tree work he did.

 - a few code-size improvements, switching to __always_inline where gcc
   screwed up.

 - partially implement character sets in sscanf

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (118 commits)
  sscanf: implement basic character sets
  lib/bug.c: use common WARN helper
  param: convert some "on"/"off" users to strtobool
  lib: add "on"/"off" support to kstrtobool
  lib: update single-char callers of strtobool()
  lib: move strtobool() to kstrtobool()
  include/linux/unaligned: force inlining of byteswap operations
  include/uapi/linux/byteorder, swab: force inlining of some byteswap operations
  include/asm-generic/atomic-long.h: force inlining of some atomic_long operations
  usb: common: convert to use match_string() helper
  ide: hpt366: convert to use match_string() helper
  ata: hpt366: convert to use match_string() helper
  power: ab8500: convert to use match_string() helper
  power: charger_manager: convert to use match_string() helper
  drm/edid: convert to use match_string() helper
  pinctrl: convert to use match_string() helper
  device property: convert to use match_string() helper
  lib/string: introduce match_string() helper
  radix-tree tests: add test for radix_tree_iter_next
  radix-tree tests: add regression3 test
  ...
2016-03-18 19:26:54 -07:00
..
2015-06-10 14:26:32 -07:00
2014-08-26 13:45:52 -04:00
2014-08-26 13:45:52 -04:00
2016-01-12 20:46:55 +02:00
2014-04-18 14:20:35 +02:00
2013-02-26 02:46:08 -05:00
2015-06-10 14:26:32 -07:00
2015-06-10 14:26:32 -07:00
2016-03-17 15:09:34 -07:00
2012-06-25 13:48:30 +02:00
2015-06-10 14:26:32 -07:00
2012-03-28 18:30:02 +01:00
2010-06-09 11:12:36 +02:00
2012-03-28 18:30:02 +01:00
2010-05-18 14:45:52 -07:00
2015-06-10 14:26:32 -07:00
2011-03-31 11:26:23 -03:00
2016-03-17 15:09:34 -07:00
2012-03-28 18:30:02 +01:00
2013-01-03 15:57:13 -08:00
2014-08-26 13:45:52 -04:00
2015-01-13 15:23:34 +02:00