Merge with mainline to remove plat-omap/Kconfig conflict
[safe/jmp/linux-2.6] / drivers / mfd / adp5520.c
2009-12-13 Mark Brownmfd: Staticise __adp5520_ack_bits()
2009-12-13 Michael Hennerichmfd: Add ADP5520/ADP5501 driver