tree 47d9b7bbeb6b28f85fe107928a6f59cdda891fa0
parent 79c410db6680e8393314003739233b1df0a338fe
parent 14d1012db8462bbb7139ac4622f92e541d3019d1
parent d4b19c42ca558273ab99a1093621f267d9d073fc
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1215715838 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1215715838 +0100

Merge branches 'pxa-ezx', 'pxa-magician' and 'pxa-palm' into pxa