tree 01dfd20489e9cec42f43bc0588cf82989fcc132e
parent 0d735eaa2c1d80c997fd775b679e36b80b8e85d1
parent 1dcb4f38e5bc28dfce0f8c7eef184a090b03bfc7
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1291644887 +0000
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1291644887 +0000

Merge branch 'for-2.6.37' into for-2.6.38

Conflicts:
	include/linux/mfd/wm8994/pdata.h