The tag, GregKH-20100625 has been created at f2204f0631662cc7431fb06c7897ac58df8e4b89 (commit)

- Shortlog ------------------------------------------------------------ commit f2204f0631662cc7431fb06c7897ac58df8e4b89 Merge: 89b7f22 9ec2d8f Author: Sven Eckelmann sven.eckelmann@gmx.de Date: Fri Jun 25 23:08:01 2010 +0200

Merge branch 'maint' into linux

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

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