Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / mfd / ab3100-core.c