Merge branch 'regulator' of git://github.com/hzhuang1/linux into next/drivers
Olof Johansson [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
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge