diff options

author	Dmitry Torokhov <dmitry.torokhov@gmail.com>	2017-01-24 09:57:18 -0800
committer	Dmitry Torokhov <dmitry.torokhov@gmail.com>	2017-01-24 09:57:18 -0800
commit	62ed8ceda1699acae01b666497f004bfd3d67a6f (patch)
tree	fe38c83c49dfd568b540666948ef78cb9d082c38 /sound
parent	1c3415a06b1016a596bfe59e0cfee56c773aa958 (diff)
parent	7a308bb3016f57e5be11a677d15b821536419d36 (diff)

Merge tag 'v4.10-rc5' into for-linus

Sync up with mainline to apply fixup to a commit that came through power supply tree.

Diffstat (limited to 'sound')