tree a72c0ec1ce0fbcdcd12ecb6aad9bedcc94b94f9d
parent 473f89fff76568a9f30c53b458e6323d48b0ab95
parent 29c798fecb9b846b363b0a02fa662ff42fc19426
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1288706329 -0400
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1288706329 -0400

Merge branch 'for-2.6.37' into HEAD

WARN() fix from Joe moved.

Conflicts:
	sound/soc/codecs/wm_hubs.c