From: Jiri Kosina <jkosina@suse.cz>
Date: Wed, 20 Jul 2011 09:59:21 +0000 (+0200)
Subject: trivial: don't touch files that are removed in the staging tree
X-Git-Tag: v3.1-rc1~245^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b42f06517ae19d6519e9c54eac5ea58d00f3028;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed