projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 75f01f9 0ea34b5)
Merge remote-tracking branch 'regulator/topic/palmas' into v3.9-rc8
authorMark Brown <broonie@sirena.org.uk>
Sun, 28 Apr 2013 01:13:45 +0000 (02:13 +0100)
committerMark Brown <broonie@sirena.org.uk>
Sun, 28 Apr 2013 01:13:45 +0000 (02:13 +0100)
1  2 
drivers/regulator/palmas-regulator.c patch | diff1 | diff2 | blob | history
include/linux/mfd/palmas.h patch | diff1 | diff2 | blob | history

diff --cc drivers/regulator/palmas-regulator.c
index 39cf14606784bd3571c6aab2d361807d0bdf7c99,1be9c3216974fed7683531337311f79a3fd7fdaa..92ceed0fc65e780216861143c8ccc25f9c16fa53
--- 1/drivers/regulator/palmas-regulator.c
--- 2/drivers/regulator/palmas-regulator.c
+++ b/drivers/regulator/palmas-regulator.c
@@@ -1,10 -1,9 +1,10 @@@
  /*
   * Driver for Regulator part of Palmas PMIC Chips
   *
-  * Copyright 2011-2012 Texas Instruments Inc.
+  * Copyright 2011-2013 Texas Instruments Inc.
   *
   * Author: Graeme Gregory <gg@slimlogic.co.uk>
 + * Author: Ian Lartey <ian@slimlogic.co.uk>
   *
   *  This program is free software; you can redistribute it and/or modify it
   *  under  the terms of the GNU General  Public License as published by the
diff --cc include/linux/mfd/palmas.h
Simple merge