Hi Paul, Today's linux-next merge of the moduleh tree got a conflict in arch/arm/plat-s5p/dev-tv.c from merge fix patch "arm-Add-export.h-to-recently-added-files-for-EXPORT_.patch" from the moduleh tree. This file has been removed, so I dropped that hunk. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpLjaoPcw2Ut.pgp
Description: PGP signature
