tree e66402e229b7cecd5841f021e825eb487d8beec6
parent 4edf5886bba1a3fba3b780c7263f64c23536a4a5
parent 6fcb8a3a3a542ca078dc739fe0ea97191bc59e74
author Linus Torvalds <torvalds@linux-foundation.org> 1317608624 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1317608624 -0700

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