Merge branch 'for-2.6.37' into for-2.6.38
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 15 Nov 2010 13:20:12 +0000 (13:20 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 15 Nov 2010 13:20:12 +0000 (13:20 +0000)
commit6ccd744123679c1f19fb6e414e3df717d9ed57f6
tree5ab696b70ca95af60e9515f7d623c8738af1d7e1
parent3c9e28e751cf9969c2cb2e57b5573cab86cf521a
parentbcbb243396b82b0369465e9a547b7d5278cd26ad
Merge branch 'for-2.6.37' into for-2.6.38
sound/soc/s3c24xx/rx1950_uda1380.c
sound/soc/soc-dapm.c