From: Mark Brown <broonie@sirena.org.uk>
Date: Sun, 28 Apr 2013 01:13:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'regulator/topic/palmas' into v3.9-rc8
X-Git-Tag: v3.12-rc1~994^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ae5f5203e5ea2a50e90bdd3a6f2a2a2d0b2d56d5;p=kernel%2Fkernel-generic.git

Merge remote-tracking branch 'regulator/topic/palmas' into v3.9-rc8
---

ae5f5203e5ea2a50e90bdd3a6f2a2a2d0b2d56d5
diff --cc drivers/regulator/palmas-regulator.c
index 39cf146,1be9c32..92ceed0
--- a/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