The tag, GregKH-20100720 has been created at ca8c7557090ba2facafaa0ba24e4460d006e0f3c (commit)

- Shortlog ------------------------------------------------------------ commit ca8c7557090ba2facafaa0ba24e4460d006e0f3c Merge: 775dcbd 24551f5 Author: Sven Eckelmann sven.eckelmann@gmx.de Date: Tue Jul 20 23:49:18 2010 +0200

Merge branch 'maint' into linux

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

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