Merge branch 'sa11x0-dma' into sa11x0-ir
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 7 Mar 2012 11:46:12 +0000 (11:46 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 7 Mar 2012 11:46:12 +0000 (11:46 +0000)
commitbb8c95055aef340e05ff0ba5cfb9063c51534376
treef231e7d9baf0c6d90d59f1545e1c4ab81d564d36
parent3c500a35544d6270b127bce7d4c5a15ef454b9e2
parent7931d92f4f38100061cf6b8a9737967057f94871
Merge branch 'sa11x0-dma' into sa11x0-ir