The tag, GregKH-20101121 has been created at e9e792fe425b833807c617d00b6443bda920c1c3 (commit)
- Shortlog ------------------------------------------------------------ commit e9e792fe425b833807c617d00b6443bda920c1c3 Merge: 5d13fd6 187cb65 Author: Sven Eckelmann sven.eckelmann@gmx.de Date: Sun Nov 21 22:58:03 2010 +0100
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/bat_printk.c drivers/staging/batman-adv/compat.h drivers/staging/batman-adv/hard-interface.c drivers/staging/batman-adv/icmp_socket.c drivers/staging/batman-adv/originator.c drivers/staging/batman-adv/routing.c drivers/staging/batman-adv/send.c drivers/staging/batman-adv/soft-interface.c drivers/staging/batman-adv/translation-table.c drivers/staging/batman-adv/vis.c
-----------------------------------------------------------------------