Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Sep 2010 21:57:53 +0000 (14:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Sep 2010 21:57:53 +0000 (14:57 -0700)
commit9d457c60ba783c709c750b851d07f0ac8af78ce9
tree9e28956058607759b3ef63c0fb6fc9a0e3d9a810
parentf12f662f29d5801e598c6bb4a71e54b2de218f72
parent90182317a9e383474613aa60e9d61d57bdf17c3e
Merge branch 'for-linus' of git://git./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