]> www.infradead.org Git - users/hch/misc.git/commitdiff
projects / users / hch / misc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3a70b7e 8a16a70)
Merge branch 'regulator' of git://github.com/hzhuang1/linux into next/drivers
authorOlof Johansson <olof@lixom.net>
Thu, 8 Mar 2012 17:33:44 +0000 (09:33 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 8 Mar 2012 17:33:44 +0000 (09:33 -0800)
* 'regulator' of git://github.com/hzhuang1/linux: (2 commits)
  regulator: Remove bq24022 regulator driver
  pxa: magician/hx4700: Convert to gpio-regulator from bq24022

  (plus update to v3.3-rc6)

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
arch/arm/mach-pxa/pxa25x.c patch | diff1 | diff2 | blob | history
arch/arm/mach-pxa/pxa27x.c patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/mach-pxa/pxa25x.c
Simple merge
diff --cc arch/arm/mach-pxa/pxa27x.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.