| commit | 9b42f06517ae19d6519e9c54eac5ea58d00f3028 | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Wed Jul 20 11:59:21 2011 +0200 |
| committer | Jiri Kosina <jkosina@suse.cz> | Wed Jul 20 11:59:21 2011 +0200 |
| tree | 3d81cf89b8df0d065ff73524012339c87f0371a6 | |
| parent | f996f2081276c37da4dbd7b2e6310fbc8f0034f6 [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>