Messages in this thread | | | Date | Thu, 13 Oct 2011 17:31:17 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the moduleh tree with the tree |
| |
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@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |