]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'battery/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 03:18:27 +0000 (14:18 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 03:18:27 +0000 (14:18 +1100)
commit3fdbb886b87b5a705d6caa094b078c5d037b5280
treea9be3c0112de632252c6b65d7fa37419a95e0672
parent40c60b1614a72d195d0358874244918353245e83
parent845e37e009281b63fe15348f37bd7f815ea65da0
Merge remote-tracking branch 'battery/master'

Conflicts:
include/linux/mfd/abx500/ab8500.h
MAINTAINERS
drivers/mfd/ab8500-core.c
include/linux/mfd/abx500.h
include/linux/mfd/abx500/ab8500.h