Merge tag 'v3.18-rc7' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 3 Dec 2014 08:38:03 +0000 (09:38 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 3 Dec 2014 08:38:58 +0000 (09:38 +0100)
... for allowing more cleanups of hda_intel.c driver-caps where both
upstream and for-next contain the changes.


Trivial merge