From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 20 Mar 2013 13:33:22 +0000 (+0100)
Subject: Merge remote-tracking branch 'regulator/topic/palmas' into regulator-next
X-Git-Tag: next-20130321~44^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6f937de79abf8368c0334e249fb9bfbe90967377;p=karo-tx-linux.git

Merge remote-tracking branch 'regulator/topic/palmas' into regulator-next
---

6f937de79abf8368c0334e249fb9bfbe90967377
diff --cc drivers/regulator/palmas-regulator.c
index 39cf14606784,aec2d76096dd..4a45942b6a16
--- 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