linux-next: manual merge of the battery tree with the arm-currenttree

From: Stephen Rothwell
Date: Mon Jun 14 2010 - 22:55:25 EST

Hi Anton,

Today's linux-next merge of the battery tree got a conflict in
drivers/power/z2_battery.c between commit
56b925fccc58cd43fc553a8302dbbdd440aef288 ("[ARM] pxa/z2: fix missing
include in battery driver") from the arm-current tree and commit
5d111107b7994349feb681466f873b1a4f8a09d6 ("z2_battery: Remove duplicated
#include") from the battery tree.

The former is a superset of the latter.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature