diff --git a/[refs] b/[refs] index 2d6665572102..a32306ec5163 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6445b84abf91549d8568fb5d9155447e6dba86cc +refs/heads/master: f69d3a17ea240520221a2e93759e1c958b5e719d diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 03df1d15ebf3..bfdfc21c475f 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -5866,6 +5866,16 @@ L: linux-fbdev@vger.kernel.org S: Maintained F: drivers/video/s3c-fb.c +SAMSUNG MULTIFUNCTION DEVICE DRIVERS +M: Sangbeom Kim +L: linux-kernel@vger.kernel.org +S: Supported +F: drivers/mfd/sec*.c +F: drivers/regulator/s2m*.c +F: drivers/regulator/s5m*.c +F: drivers/rtc/rtc-sec.c +F: include/linux/mfd/samsung/ + SERIAL DRIVERS M: Alan Cox L: linux-serial@vger.kernel.org