]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 16 May 2011 15:55:49 +0000 (08:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 16 May 2011 15:55:49 +0000 (08:55 -0700)
* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
  OMAP3: set the core dpll clk rate in its set_rate function
  omap: iommu: Return IRQ_HANDLED in fault handler when no fault occured


Trivial merge