|
|
|
linux-next: manual merge of the moduleh tree with the tree | |
| [Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] | |
Hi Paul, Today's linux-next merge of the moduleh tree got a conflict in arch/arm/plat-s5p/dev-tv.c between commits from the s5p tree and fixup patch "arm-Add-export.h-to-recently-added-files-for-EXPORT_.patch" from the moduleh tree. The file above has been removed, so I dropped that hunk from the patch. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpzkqJcy72Qg.pgp
Description: PGP signature
|
|