Merge branch 'topic/timestamp' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 23 Feb 2015 08:15:02 +0000 (09:15 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 23 Feb 2015 08:15:02 +0000 (09:15 +0100)
commit72f770c6acde425eaad8f482969a785af4512f4f
treecbcbad8739662597d9336d5663897b74baf92eda
parent0eee62e08c0b3ba068472b899cdda08cf4b4544b
parentc72638bdaabe9ea4b09003b9db7e1754f472fbed
Merge branch 'topic/timestamp' into for-next
include/uapi/sound/asound.h
sound/pci/hda/hda_controller.c