The tag, GregKH-20100809 has been created at ac622e833503b76e719747b27402489128a36c9b (commit) - Shortlog ------------------------------------------------------------ commit ac622e833503b76e719747b27402489128a36c9b Merge: ab8569a d5e36e0 Author: Sven Eckelmann <sven.eckelmann(a)gmx.de&gt; Date: Mon Aug 9 23:21:51 2010 +0200 Merge branch 'maint' into linux Conflicts: drivers/staging/batman-adv/icmp_socket.c ----------------------------------------------------------------------- -- linux integration