]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1853e23) | 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)
commitff65fbbcd2be1491a231409eddb55377a035215e
treec04090e00c5b0e367e40db29ed266eddad42e942tree | snapshot
parent1853e2317e21a14617118510a9189a0da62e6d2bcommit | diff
Staging: batman-adv: Fix merge of linus tree

Greg Kroah-Hartman merged Linus 2.6.36 tree in
d58a1c8c5012b903b21ad5a6bcd160550943b098 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 | history
drivers/staging/batman-adv/hard-interface.c diff | blob | history
Linux Kernel Source Tree.