Merge tag 'asoc-v3.17-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorTakashi Iwai <tiwai@suse.de>
Wed, 1 Oct 2014 07:29:26 +0000 (09:29 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 1 Oct 2014 07:29:26 +0000 (09:29 +0200)
commitb7c2dc8e684a37d8f9544b9e528c050f2bb7ef47
treefe0f18b10ecccf0336767df2b11bd87da21b7fbc
parent5498380e4f403c0938801e2cd6683353d0029cac
parentfe2a08b3bf1a6e35c00e18843bc19aa1778432c3
Merge tag 'asoc-v3.17-rc7' of git://git./linux/kernel/git/broonie/sound into for-linus

ASoC: Fix SSM2602 device identification

Another fix for v3.17, fixing device identification after the split out
of the I2C and SPI code.