From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 21 Jul 2008 04:16:27 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd
X-Git-Tag: v2.6.27-rc1~965
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae0645a451b02ad35c520b01177b70ebd59c91ab;p=linux-2.6

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
---

ae0645a451b02ad35c520b01177b70ebd59c91ab