Merge branches 'devel-iommu-mailbox' and 'devel-l2x0' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Tue, 21 Dec 2010 03:13:40 +0000 (19:13 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 21 Dec 2010 03:13:40 +0000 (19:13 -0800)
commit4584acc3ee236424b5d0b52f143d980cae3c2be5
treebc085d6c81a5ee5e721bfe90d84487156c2b5944
parentf0c61d3d3c319def8feebb99682ae0223a41dffe
parentc7d3e9e801d72e86eb8a0f311453192a84f14412
parentb89cd71a159b5edca4c429687e4af01708eb1b26
Merge branches 'devel-iommu-mailbox' and 'devel-l2x0' into omap-for-linus