summaryrefslogtreecommitdiffstats
path: root/sound/oss/audio.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-02-13 17:35:23 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-02-13 17:35:23 -0800
commit7686e3c16c4a3669472298ecfc4636485658642b (patch)
treefc8e06e00d2348e20eacb00ddad34c182f9f4063 /sound/oss/audio.c
parent2f2e9f2dd1f454f3c4f751b6f83359bc48f21096 (diff)
parent75c1657e1d50730dc0130a67977f7831a4e241f4 (diff)
downloadlinux-7686e3c16c4a3669472298ecfc4636485658642b.tar.bz2
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
Pull more rdma fixes from Doug Ledford: "I think we are getting pretty close to done now. There are four one-off fixes in this update: - fix ipoib multicast joins - fix mlx4 error handling - fix mlx5 size computation - fix a thinko in core code" * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: IB/mlx5: Fix RC transport send queue overhead computation IB/ipoib: fix for rare multicast join race condition IB/core: Fix reading capability mask of the port info class net/mlx4: fix some error handling in mlx4_multi_func_init()
Diffstat (limited to 'sound/oss/audio.c')
0 files changed, 0 insertions, 0 deletions