tree 55a007e8903e097cc1fee52dd17887b92d60c257
parent d5471e67229adb31a1e5f026955d006f06315f3d
parent e4d9e513dedb5ac4e166c1053314fa935ddecc8c
author Takashi Iwai <tiwai@suse.de> 1404452937 +0200
committer Takashi Iwai <tiwai@suse.de> 1404452937 +0200

Merge branch 'for-linus' into for-next

Conflicts:
	sound/pci/hda/hda_intel.c