The branch, merge/master2 has been created at d74c32cbc10d58020614e5710f43d58e331a6b04 (commit)

- Shortlog ------------------------------------------------------------ commit d74c32cbc10d58020614e5710f43d58e331a6b04 Merge: 34dbd45 f722406 Author: Antonio Quartulli ordex@autistici.org Date: Fri May 17 09:34:56 2013 +0200

Merge commit 'f722406faae2d073cc1d01063d1123c35425939e' into HEAD

(Linux v3.10-rc1 - tag did not exist in net-next)

Conflicts: net/batman-adv/network-coding.c net/batman-adv/routing.c

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