| commit | 466122df80e447883588ffcf9d21b88152934819 | [log] [tgz] |
|---|---|---|
| author | Sven Eckelmann <sven.eckelmann@gmx.de> | Mon Aug 09 23:56:38 2010 +0200 |
| committer | Greg Kroah-Hartman <gregkh@suse.de> | Mon Aug 23 18:15:35 2010 -0700 |
| tree | c04090e00c5b0e367e40db29ed266eddad42e942 | |
| parent | 49b48547724eca062aec13a3bfd621194836513b [diff] |
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>