From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 31 Jan 2011 22:27:55 +0000 (+1000)
Subject: Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=35a8524ffe84667e805b9249316e729e050c83b2;p=linux-beck.git

Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/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:
  arch/arm/mach-omap2/dma.c: Convert IS_ERR result to PTR_ERR
  arm: omap2: mux: fix compile warning
  omap1: Simplify use of omap_irq_flags
  omap2+: Fix unused variable warning for omap_irq_base
---

35a8524ffe84667e805b9249316e729e050c83b2