Merge branch 'for-2.6.37' into for-2.6.38
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 30 Nov 2010 11:35:43 +0000 (11:35 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 30 Nov 2010 11:35:43 +0000 (11:35 +0000)
commitdfa7c70b04bb20df7936018c737014655bf92d09
treef5eb47ca770d70fe2d55006bc1a4e552b964c422
parent551102762ebe8bc0aa867d28960d9be97bbe17c1
parentb76fb39d49f67a484a6adc8f041d9ad833f6860e
Merge branch 'for-2.6.37' into for-2.6.38
sound/soc/s6000/s6105-ipcam.c