git.openpandora.org / pandora-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f996f20) | patch
trivial: don't touch files that are removed in the staging tree
authorJiri Kosina <jkosina@suse.cz>
Wed, 20 Jul 2011 09:59:21 +0000 (11:59 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 20 Jul 2011 09:59:21 +0000 (11:59 +0200)
commit9b42f06517ae19d6519e9c54eac5ea58d00f3028
tree3d81cf89b8df0d065ff73524012339c87f0371a6tree | snapshot
parentf996f2081276c37da4dbd7b2e6310fbc8f0034f6commit | diff
trivial: don't touch files that are removed in the staging tree

This is a partial revert of e44ba033c565 ("treewide: remove duplicate
includes") and 28f65c11f2ff ("treewide: Convert uses of struct resource
to resource_size(ptr)") as the files in question have been removed in
staging tree, so get rid of the conflict.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/staging/generic_serial/ser_a2232.c diff | blob | history
drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyashalomap_kernel.h diff | blob | history
drivers/staging/westbridge/astoria/gadget/cyasgadget.h diff | blob | history
Pandora Kernel Repository