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)
commit9b13776977d45505469edc6decc93e9e3799afe2
treee66402e229b7cecd5841f021e825eb487d8beec6
parent4edf5886bba1a3fba3b780c7263f64c23536a4a5
parent6fcb8a3a3a542ca078dc739fe0ea97191bc59e74
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