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)
1  2 
include/uapi/sound/asound.h
sound/pci/hda/hda_controller.c

Simple merge
Simple merge