tree cd120ec609f8cad914f0b5b967d358d0d104d8bd
parent f894d18380e7e7ff05f6622ccb75d2881922c6e9
parent 99cdb0c8c5e0e43652d25951a85bac82a1231591
author Linus Torvalds <torvalds@linux-foundation.org> 1216613787 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1216613787 -0700

Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd

* 'for-linus' of git://git.o-hand.com/linux-mfd:
  mfd: let asic3 use mem resource instead of bus_shift
  mfd: remove DS1WM register definitions from asic3.h
  mfd: add ASIC3_CONFIG_GPIO templates
  mfd: fix the asic3 irq demux code
  mfd: asic3 should depend on gpiolib
  mfd: fix asic3 config array initialisation
  mfd: move asic3 probe functions into __init section
  mfd: Use uppercase only for asic3 macros and defines
  mfd: use dev_* macros for asic3 debugging
  mfd: New asic3 gpio configuration code
  mfd: asic3 children platform data removal
  mfd: asic3 gpiolib support