The tag, GregKH-20100706 has been created at 4743c625ed5350308009f7dfa3eb60cd3e8bd143 (commit)

- Shortlog ------------------------------------------------------------ commit 4743c625ed5350308009f7dfa3eb60cd3e8bd143 Merge: 4b8c81a f4ba126 Author: Sven Eckelmann sven.eckelmann@gmx.de Date: Tue Jul 6 20:26:04 2010 +0200

Merge branch 'maint' into linux

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

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