]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit8ec44ca8dc8170011b132026fe7f2a02def91ca8
tree01dfd20489e9cec42f43bc0588cf82989fcc132e
parenta5775435f04121b29e494c522bc2d78df1162926
parent27e49b809e5f83c680acaa807fc01938e49734a5
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