aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss/sys_timer.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-02-23 09:15:02 +0100
committerTakashi Iwai <tiwai@suse.de>2015-02-23 09:15:02 +0100
commit72f770c6acde425eaad8f482969a785af4512f4f (patch)
treecbcbad8739662597d9336d5663897b74baf92eda /sound/oss/sys_timer.c
parentMerge branch 'topic/pcm-internal' into for-next (diff)
parentALSA: bump PCM protocol to 2.0.13 (diff)
downloadlinux-dev-72f770c6acde425eaad8f482969a785af4512f4f.tar.xz
linux-dev-72f770c6acde425eaad8f482969a785af4512f4f.zip
Merge branch 'topic/timestamp' into for-next
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions