]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 4 Jul 2014 05:48:57 +0000 (07:48 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 4 Jul 2014 05:48:57 +0000 (07:48 +0200)
commitc7b63c7f82e8bbe1fbf4c44c939bd79443651c45
tree55a007e8903e097cc1fee52dd17887b92d60c257
parent5b756a8030f48229129eb8ba9bb78eb90d7a08ae
parentddcb40e39927a301876ccf0a588cdac53560a44c
Merge branch 'for-linus' into for-next

Conflicts:
sound/pci/hda/hda_intel.c
sound/pci/hda/hda_i915.c
sound/pci/hda/hda_intel.c
sound/pci/hda/patch_realtek.c