The tag, GregKH-20100618 has been created at 1e87c117472b3793c206d6ebb403b7fc0abefa36 (commit)

- Shortlog ------------------------------------------------------------ commit 1e87c117472b3793c206d6ebb403b7fc0abefa36 Merge: e361098 1a0a622 Author: Sven Eckelmann sven.eckelmann@gmx.de Date: Sat Jun 19 01:23:29 2010 +0200

Merge branch 'maint' into linux

Conflicts: drivers/staging/batman-adv/README drivers/staging/batman-adv/compat.h drivers/staging/batman-adv/send.c

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