The branch, linux has been created at 1e87c117472b3793c206d6ebb403b7fc0abefa36 (commit)

- Shortlog ------------------------------------------------------------ commit 1e87c117472b3793c206d6ebb403b7fc0abefa36 Merge: e36109825a5d38db310a87e8cee439add80fdc91 1a0a622c040bcc6db492af5df50ad3bb5cb4d9ae 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

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