1
0
Fork 0
alistair23-linux/sound/drivers
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
..
mpu401 ALSA: Include linux/io.h instead of asm/io.h 2015-01-28 16:49:33 +01:00
opl3 Merge branch 'for-linus' into for-next 2015-03-09 08:42:00 +01:00
opl4 ALSA: opl4: Fix / cleanup ifdef CONFIG_PROC_FS 2015-05-29 07:49:55 +02:00
pcsp sound: query dynamic DEBUG_PAGEALLOC setting 2016-03-17 15:09:34 -07:00
vx ALSA: Include linux/io.h instead of asm/io.h 2015-01-28 16:49:33 +01:00
Kconfig ALSA: sound kconfig typo 2013-04-24 14:02:36 +02:00
Makefile ALSA: introduce the snd-aloop module for the PCM loopback 2010-08-09 14:21:11 +02:00
aloop.c ALSA: aloop: Drop unnecessary ifdef CONFIG_PROC_FS 2015-05-29 07:46:05 +02:00
dummy.c ALSA: dummy: Implement timer backend switching more safely 2016-02-08 08:15:35 +01:00
ml403-ac97cr.c ALSA: Deletion of checks before the function call "iounmap" 2015-01-04 15:13:45 +01:00
mtpav.c ALSA: mtpav: Use setup_timer() and mod_timer() 2015-01-19 11:32:10 +01:00
mts64.c ALSA: mts64: fix NULL pointer dereference 2016-02-29 13:23:46 +01:00
pcm-indirect2.c treewide: Fix typos in printk 2015-12-08 14:59:19 +01:00
pcm-indirect2.h [ALSA] Xilinx ML403 AC97 Controller Reference device driver 2008-01-31 17:29:15 +01:00
portman2x4.c ALSA: portman2x4: fix NULL pointer dereference 2016-03-02 16:23:24 +01:00
serial-u16550.c ALSA: Include linux/io.h instead of asm/io.h 2015-01-28 16:49:33 +01:00
virmidi.c Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00