Merge branch 'tegra' into for-2.6.40
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 18 Apr 2011 17:08:22 +0000 (18:08 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 18 Apr 2011 17:08:22 +0000 (18:08 +0100)
commitc6d46678a1adacde05a01e51361610ce2666fe6a
tree1ced2c0d6b582f1b072786430155da2b041e5d76
parentd5381e42f64ca19f05c5799ffae5708acb6ed411
parent61a6d0764be43e014d265128c2af1b41e0fc96b0
Merge branch 'tegra' into for-2.6.40
sound/soc/tegra/harmony.c