projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 692af90 bf06848)
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)
commit4af88a9c1ba2d39263eef003ea598c657014e59e
tree0470cb215c77b91147f23f55c63a733e3628a8cbtree | snapshot (tar.gz zip)
parent692af901df615b7783caaccdb287cddf2d7f6059commit | diff
parentbf06848bdbe549175d25d2327ab9f37d4bd556b7commit | 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