projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 88dd75a 41ef2d5)
Merge tag 'v3.9-rc7' into regulator-fix-core
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 15 Apr 2013 16:27:12 +0000 (17:27 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 15 Apr 2013 16:27:12 +0000 (17:27 +0100)
Linux 3.9-rc7

Trivial context overlap conflicts:
MAINTAINERS

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
index f40cfb71ef087c25cd311d40d23858a253ee2845,8bdd7a7ef2f4687aa26ee66a70fe8ad428e14890..c2d345896839b14a0e22dd586ee68ccfe42db73a
--- 1/MAINTAINERS
--- 2/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