From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 3 Oct 2011 02:23:44 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.infradead.org/users/sameo/mfd-2.6
X-Git-Tag: v3.1-rc9~10
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=9b13776977d45505469edc6decc93e9e3799afe2

Merge branch 'for-linus' of git://git.infradead.org/users/sameo/mfd-2.6

* 'for-linus' of git://git.infradead.org/users/sameo/mfd-2.6:
  mfd: Fix generic irq chip ack function name for jz4740-adc
---

9b13776977d45505469edc6decc93e9e3799afe2