tree 076b83a26bcd63d6158463735dd34c10bbc591dc
parent 9e495834e59ca9b29f1a1f63b9f5533bb022ac49
parent 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1238272191 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1238272191 +0000

Merge branch 'origin' into devel

Conflicts:
	sound/soc/pxa/pxa2xx-i2s.c