2b324
parent 46c41e62a1feb4ab2e941f33f06bbf8feab2d2cf
parent 3c3e69cd4c667e6ce7939d83b274d48c57779479
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1184272218 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1184272218 +0100

Merge branches 'at91', 'davinci', 'imx', 'iop', 'ixp', 'ks8695', 'misc', 'pxa' and 's3c' into devel