diff options
| author | Sven Eckelmann <sven.eckelmann@gmx.de> | 2010-08-09 17:56:38 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-23 21:15:35 -0400 |
| commit | 466122df80e447883588ffcf9d21b88152934819 (patch) | |
| tree | c04090e00c5b0e367e40db29ed266eddad42e942 /drivers/sfi | |
| 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>
Diffstat (limited to 'drivers/sfi')
0 files changed, 0 insertions, 0 deletions