aboutsummaryrefslogtreecommitdiff
path: root/sound/oss/sys_timer.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2015-08-24 16:36:42 +1000
committerDave Airlie <airlied@redhat.com>2015-08-24 16:36:42 +1000
commit3732ce72b45a2a145803558758821bf198751276 (patch)
tree75047ed1f43cfd56231535c401924dbb27c4d0f0 /sound/oss/sys_timer.c
parente829d7ef9f17d7b84d4c3d110ecd4b7b2bcba865 (diff)
parentc13dcf9f2d6f5f06ef1bf79ec456df614c5e058b (diff)
Merge tag 'v4.2-rc8' into drm-next
Linux 4.2-rc8 Backmerge required for Intel so they can fix their -next tree up properly.
Diffstat (limited to 'sound/oss/sys_timer.c')
0 files changed, 0 insertions, 0 deletions