Merge branch 'for-2.6.33' into for-2.6.34
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 12 Jan 2010 12:59:05 +0000 (12:59 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 12 Jan 2010 12:59:05 +0000 (12:59 +0000)
commit163849ea9b4c5d50fbd324692461983d18faadad
tree7176a18fea53560eb4092aa103d94a266ab4e60d
parent2138301e1687bd4f22aa2b4df4829b6ffdae19bc
parent5ee518ecbcb5934e284ea51a19a939c891f5f7ea
Merge branch 'for-2.6.33' into for-2.6.34
sound/soc/codecs/wm8993.c
sound/soc/sh/fsi.c
sound/soc/soc-core.c