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: firefly_0821_release~3680^2~4388
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9b13776977d45505469edc6decc93e9e3799afe2;p=firefly-linux-kernel-4.4.55.git

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