Merge branch 'for-3.0' into for-3.1
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 6 Jun 2011 20:57:54 +0000 (21:57 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 6 Jun 2011 20:57:54 +0000 (21:57 +0100)
commit46758dee727348d3648c83445d10ded321376543
tree3c0649b6150901d1d480b3c3a84c45341b09ce2d
parentf97d0c6d5f947a96a6d3957eff3da6d9ca246e54
parent8ca695f273709a9d147826716a8dee3e0eb2407f
Merge branch 'for-3.0' into for-3.1
sound/soc/codecs/ad1836.c
sound/soc/codecs/ad1836.h