linux-next: manual merge of the staging tree with the ux500-core tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
arch/arm/mach-ux500/board-mop500-u8500uib.c between commit 0df7aaf0f276
("mach-ux500: fix build error due to unknown 'regulator_en' field") from
the ux500-core tree and commit 857f727674f4 ("staging: ste_rmi4: remove
cross-dependent platform data") from the staging tree.

The second supercedes the first, so I used that.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgpaGoK2CU8JW.pgp
Description: PGP signature


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux