From: Sven Eckelmann <sven.eckelmann@gmx.de>
Date: Mon, 9 Aug 2010 21:56:38 +0000 (+0200)
Subject: Staging: batman-adv: Fix merge of linus tree
X-Git-Tag: v2.6.36-rc3~38^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=466122df80e447883588ffcf9d21b88152934819;p=pandora-kernel.git

Staging: batman-adv: Fix merge of linus tree

Greg Kroah-Hartman merged Linus 2.6.36 tree in
e9563355ac1175dd3440dc2ea5c28b27ed51a283 with his staging tree.
Different parts of the merge conflicts were resolved incorrectly and may
result in an abnormal behavior.

Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

Reading git-diff-tree failed