The tag, GregKH-20100720 has been created at 775dcbd8bef32c36182b5eece4ce7a889eb74750 (commit)
- Shortlog ------------------------------------------------------------ commit 775dcbd8bef32c36182b5eece4ce7a889eb74750 Merge: 5610854 5d3755f Author: Sven Eckelmann sven.eckelmann@gmx.de Date: Tue Jul 20 20:18:01 2010 +0200
Merge branch 'maint' into linux
Conflicts: drivers/staging/batman-adv/compat.h
-----------------------------------------------------------------------