Merge branch 'for-linus' of git://git.infradead.org/users/sameo/mfd-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Oct 2011 02:23:44 +0000 (19:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Oct 2011 02:23:44 +0000 (19:23 -0700)
* 'for-linus' of git://git.infradead.org/users/sameo/mfd-2.6:
  mfd: Fix generic irq chip ack function name for jz4740-adc


Trivial merge