Merge branch 'topic/owner' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

Conflicts:
	sound/soc/codecs/ssm4567.c

diff --cc sound/soc/codecs/ssm4567.c
index af536ae,f3f1f68..7a12ac5
--- 1/sound/soc/codecs/ssm4567.c
--- 2/sound/soc/codecs/ssm4567.c
+++ b/sound/soc/codecs/ssm4567.c
@@@ -464,8 -453,6 +464,7 @@@ MODULE_DEVICE_TABLE(acpi, ssm4567_acpi_
  static struct i2c_driver ssm4567_driver = {
        .driver = {
                .name = "ssm4567",
-               .owner = THIS_MODULE,
 +              .acpi_match_table = ACPI_PTR(ssm4567_acpi_match),
        },
        .probe = ssm4567_i2c_probe,
        .remove = ssm4567_i2c_remove,