The tag, GregKH-20100904 has been created at a24f6612aba0bd608e7399c6bca18bd434f8f1a3 (commit)
- Shortlog ------------------------------------------------------------ commit a24f6612aba0bd608e7399c6bca18bd434f8f1a3 Merge: 2aa1367 6b0d828 Author: Sven Eckelmann sven.eckelmann@gmx.de Date: Sat Sep 4 16:20:01 2010 +0200
Merge remote branch 'origin/next' into linux
Conflicts: drivers/staging/batman-adv/CHANGELOG drivers/staging/batman-adv/Makefile.kbuild drivers/staging/batman-adv/README drivers/staging/batman-adv/compat.h drivers/staging/batman-adv/routing.c drivers/staging/batman-adv/send.c drivers/staging/batman-adv/soft-interface.c
-----------------------------------------------------------------------