diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 06:16:27 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 06:16:27 +0200 |
commit | ae0645a451b02ad35c520b01177b70ebd59c91ab (patch) | |
tree | cd120ec609f8cad914f0b5b967d358d0d104d8bd /net | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb (diff) | |
parent | mfd: let asic3 use mem resource instead of bus_shift (diff) | |
download | linux-ae0645a451b02ad35c520b01177b70ebd59c91ab.tar.xz linux-ae0645a451b02ad35c520b01177b70ebd59c91ab.zip |
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
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions