Merge branch 'iommu' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 25 May 2009 09:15:59 +0000 (10:15 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 25 May 2009 09:20:21 +0000 (10:20 +0100)

Trivial merge