The following commit has been merged in the merge/master branch: commit 34d195c82ad86bccf772d26083155adbe5b6bd24 Merge: c1c28d6d8cf31666cea40dbf5ee5bf65c1f3c40a 6dbe51c251a327e012439c4772097a13df43c5b8 Author: Antonio Quartulli ordex@autistici.org Date: Wed Mar 6 09:01:28 2013 +0100
Merge tag 'v3.9-rc1' into merge/master
Linux 3.9-rc1
Signed-off-by: Antonio Quartulli ordex@autistici.org
Conflicts: net/batman-adv/bridge_loop_avoidance.c net/batman-adv/originator.c net/batman-adv/vis.c