git.baikalelectronics.ru Git - kernel.git/commit

author	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Tue, 2 Nov 2010 13:58:49 +0000 (09:58 -0400)
committer	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Tue, 2 Nov 2010 13:58:49 +0000 (09:58 -0400)
commit	6cc40f0754e06ea7b1cb762d7aaac67ead7389cb
tree	a72c0ec1ce0fbcdcd12ecb6aad9bedcc94b94f9d	tree \| snapshot
parent	85a34eeb1f6b581765b56ae2a010315e4c54665e	commit \| diff
parent	b82743d4023cd22c85133399cc6d37b17fcfc53e	commit \| diff

Merge branch 'for-2.6.37' into HEAD

WARN() fix from Joe moved.

Conflicts:
sound/soc/codecs/wm_hubs.c