From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 29 Sep 2010 21:57:53 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
X-Git-Tag: v2.6.36-rc7~44
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9d457c60ba783c709c750b851d07f0ac8af78ce9;p=~shefty%2Frdma-dev.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
  mfd: Fix max8925 irq control bit incorrect setting
  mfd: Ignore non-GPIO IRQs when setting wm831x IRQ types
---

9d457c60ba783c709c750b851d07f0ac8af78ce9