summaryrefslogtreecommitdiff
path: root/sound/oss
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-08-15 17:57:49 -0600
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-15 17:57:49 -0600
commitd22af68bd785fa3cdd1fbf289e0e339f415ab383 (patch)
tree95762f519918982d43cc77e73bd7974ae9760610 /sound/oss
parent68ffeca4f40dcdfc04e7134b4667e268af6c0683 (diff)
parent251964845fbf539781dd2c6406cb2ba1bf9eddd0 (diff)
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes (mostly nouveau) from Dave Airlie: "One doc buidling fixes for a file that moved, along with a bunch of nouveau fixes, one a build problem on ARM" * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/doc: Refer to proper source file drm/nouveau/platform: fix compilation error drm/nouveau/gk20a: add LTC device drm/nouveau: warn if we fail to re-pin fb on resume drm/nouveau/nvif: fix dac load detect method definition drm/gf100-/gr: fix -ENOSPC detection when allocating zbc table entries drm/nouveau/nvif: return null pointers on failure, in addition to ret != 0 drm/nouveau/ltc: fix tag base address getting truncated if above 4GiB drm/nvc0-/fb/ram: fix use of non-existant ram if partitions aren't uniform drm/nouveau/bar: behave better if ioremap failed drm/nouveau/kms: nouveau_fbcon_accel_fini can be static drm/nouveau: kill unused variable warning if !__OS_HAS_AGP drm/nouveau/nvif: fix a number of notify thinkos
Diffstat (limited to 'sound/oss')
0 files changed, 0 insertions, 0 deletions