Messages in this thread | | | Date | Tue, 25 Oct 2011 19:45:19 +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 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@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |