[commits] [git] batman-adv tag, GregKH-20100606, created. GregKH-20091208-22731-ge361098

The tag, GregKH-20100606 has been created at e36109825a5d38db310a87e8cee439add80fdc91 (commit)

- Shortlog ------------------------------------------------------------ commit e36109825a5d38db310a87e8cee439add80fdc91 Merge: a1a9b2b f720902 Author: Sven Eckelmann sven.eckelmann@gmx.de Date: Sun Jun 6 20:28:45 2010 +0200

Merge branch 'maint' into linux

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

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