The tag, DaveM-20110116 has been created at 976537c5e902a8abb23d4467fa8366c5cbbab6e8 (commit)
- Shortlog ------------------------------------------------------------ commit 976537c5e902a8abb23d4467fa8366c5cbbab6e8 Merge: c47bc5f 46e1b7c Author: Sven Eckelmann sven@narfation.org Date: Sun Jan 16 02:56:22 2011 +0100
Merge remote branch 'origin/next' into linux
Conflicts: net/batman-adv/compat.h
-----------------------------------------------------------------------