From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 15 Apr 2013 16:27:12 +0000 (+0100)
Subject: Merge tag 'v3.9-rc7' into regulator-fix-core
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cd2d95d97c8d1b66467507400c63d707ddb1deba;p=linux.git

Merge tag 'v3.9-rc7' into regulator-fix-core

Linux 3.9-rc7

Trivial context overlap conflicts:
	MAINTAINERS
---

cd2d95d97c8d1b66467507400c63d707ddb1deba
diff --cc MAINTAINERS
index f40cfb71ef087,8bdd7a7ef2f46..c2d345896839b
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -8705,8 -8712,8 +8712,8 @@@ F:	drivers/scsi/vmw_pvscsi.
  F:	drivers/scsi/vmw_pvscsi.h
  
  VOLTAGE AND CURRENT REGULATOR FRAMEWORK
 -M:	Liam Girdwood <lrg@ti.com>
 +M:	Liam Girdwood <lgirdwood@gmail.com>
- M:	Mark Brown <broonie@opensource.wolfsonmicro.com>
+ M:	Mark Brown <broonie@kernel.org>
  W:	http://opensource.wolfsonmicro.com/node/15
  W:	http://www.slimlogic.co.uk/?p=48
  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/regulator.git