Merge branch 'wm8974-upstream' into for-2.6.32
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 15 Aug 2009 10:52:43 +0000 (11:52 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 15 Aug 2009 10:52:43 +0000 (11:52 +0100)
commit37cfa1950e2a24d9fa4a593186645d8e2b5042a8
tree9d8c9485850ba506f6cdea15bff83652d6b6ca28
parent29e02cb3ffda6ef48a50fea880f63ac8178308bb
parent25cbf465207e9616e9b7d362ee166abf296d4c1e
Merge branch 'wm8974-upstream' into for-2.6.32
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile