Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Oct 2010 23:35:05 +0000 (16:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Oct 2010 23:35:05 +0000 (16:35 -0700)
commit70813196581fc636cb8a49e9bba9e04bda76206e
tree862f24526ba6ec0e7a9ebfe46100246f8a41b72a
parenta56f31a0c6a08faeca5f0c5e64c6a0113c43181b
parent0fa035e52373386381fcdfbd506e32eac0c662f0
Merge branch 'omap-fixes-for-linus' of git://git./linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
  omap: iommu-load cam register before flushing the entry