i2c: move acpi code back into the core

Commit 5d98e61d337c ("I2C/ACPI: Add i2c ACPI operation region support")
renamed the i2c-core module. This may cause regressions for
distributions, so put the ACPI code back into the core.

Reported-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Tested-by: Lan Tianyu <tianyu.lan@intel.com>
Tested-by: Mika Westerberg <mika.westerberg@linux.intel.com>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/i2c/Makefile
Simple merge

diff --cc drivers/i2c/i2c-acpi.c
Simple merge

diff --cc drivers/i2c/i2c-core.c
Simple merge

diff --cc include/linux/i2c.h
Simple merge