294836a1233beb37dd4 parent 151798f872d6b386d82cd1707ad703e981fef8f2 parent 844970916c8e50f630ea1a6ac82f09c42b12660a author Takashi Iwai 1312793131 +0200 committer Takashi Iwai 1312793131 +0200 Merge branch 'wm8996-rename' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc cÉnV™$x