]> bbs.cooldavid.org Git - net-next-2.6.git/commit
git://bbs.cooldavid.org / net-next-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 49b4854) | patch
Staging: batman-adv: Fix merge of linus tree
authorSven Eckelmann <sven.eckelmann@gmx.de>
Mon, 9 Aug 2010 21:56:38 +0000 (23:56 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 24 Aug 2010 01:15:35 +0000 (18:15 -0700)
commit466122df80e447883588ffcf9d21b88152934819
treec04090e00c5b0e367e40db29ed266eddad42e942tree | snapshot (tar.bz2 tar.gz zip)
parent49b48547724eca062aec13a3bfd621194836513bcommit | 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>
drivers/staging/batman-adv/bat_sysfs.c diff | blob | blame | history
drivers/staging/batman-adv/hard-interface.c diff | blob | blame | history
Clone of davem's net-next-2.6 tree