]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2a30119 c081d4f)
Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Thu, 11 Jun 2015 04:52:31 +0000 (06:52 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 11 Jun 2015 04:52:31 +0000 (06:52 +0200)
commit5793c18b33552c6d577e88570e99aa6a34db3b71
tree0470cb215c77b91147f23f55c63a733e3628a8cbtree | snapshot
parent2a301193c416029a767c3ea05f7c79176591e8c5commit | diff
parentc081d4ff87e6b22ddc00a44e4cd0574b49654b3fcommit | diff
Merge branch 'for-linus' into for-next

This merges and resolves the non-trivial conflicts with the recent fix
for hda-i915 binding fallback.

Conflicts:
sound/pci/hda/hda_intel.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/hda_intel.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.