The tag, GregKH-20101104 has been created at c8aec5380a5737ca9b44de05a3d6b6432e8fe2e1 (commit)

- Shortlog ------------------------------------------------------------ commit c8aec5380a5737ca9b44de05a3d6b6432e8fe2e1 Merge: 115cecb c8ddb27 Author: Sven Eckelmann sven.eckelmann@gmx.de Date: Thu Nov 4 23:12:52 2010 +0100

Merge commit 'v2.6.37-rc1' into linux

Conflicts: drivers/staging/batman-adv/hard-interface.c drivers/staging/batman-adv/routing.c drivers/staging/batman-adv/routing.h drivers/staging/batman-adv/unicast.c drivers/staging/batman-adv/vis.c

-----------------------------------------------------------------------