OSDN Git Service

Merge remote-tracking branch 'battery/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 25 Sep 2015 01:25:09 +0000 (11:25 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 25 Sep 2015 01:25:09 +0000 (11:25 +1000)
1  2 
MAINTAINERS
arch/arm/configs/omap2plus_defconfig

diff --cc MAINTAINERS
Simple merge
Simple merge