Merge branch 'for-2.6.37' into for-2.6.38
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 13 Dec 2010 16:48:38 +0000 (16:48 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 13 Dec 2010 16:48:38 +0000 (16:48 +0000)
commit90986dc98d71242e764e1f98017c041511e1c3b1
tree006488f1b82c8d645510a8718b2f2875b9c15e54
parent474b9c86b0c65e9ca6a77d8b7bf132c4d5993b9c
parent862af8adbe6b9ccb7c00c13717b1f92465f79aa2
Merge branch 'for-2.6.37' into for-2.6.38
sound/soc/soc-dapm.c