Merge branch 'for-2.6.37' into for-2.6.38
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 6 Dec 2010 14:14:47 +0000 (14:14 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 6 Dec 2010 14:14:47 +0000 (14:14 +0000)
commit0afc8c733e95642ee9200966081da82564af8f8f
tree01dfd20489e9cec42f43bc0588cf82989fcc132e
parent0d735eaa2c1d80c997fd775b679e36b80b8e85d1
parent1dcb4f38e5bc28dfce0f8c7eef184a090b03bfc7
Merge branch 'for-2.6.37' into for-2.6.38

Conflicts:
include/linux/mfd/wm8994/pdata.h
include/linux/mfd/wm8994/pdata.h
sound/soc/codecs/wm_hubs.c
sound/soc/soc-core.c