tree 6517919cb60bd9465078512cacbefd8c77f94b76
parent a2ab67fae1ab9226679495a8d260f4e6555efc5f
parent 11c79740d3c03cb81f84e98cf2e2dbd8d9bb53cd
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1243117120 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1243117120 +0100

Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into devel