Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/video/omap/lcd_ams_delta.c between commit 9586778de558 ("OMAPFB1:
remove unnecessary includes") from the tree and commit e27e35ec735f
("ARM: OMAP1: Move board-ams-delta.h from plat to mach") from the arm-soc
tree.The latter removed a superset of the former (as far as include files is concerned), so I used that and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell [email protected]
pgpPKxk6hqvY1.pgp
Description: PGP signature
