The following commit has been merged in the merge/master branch: commit 209f023fc09dda7ef78ffba555bb7b6e47459dfe Merge: 6bd389c269b2f0a2e723b6bf6d10621ae413de03 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee Author: Sven Eckelmann sven@narfation.org Date: Sun Aug 5 02:44:13 2012 +0200

Merge tag 'v3.6-rc1' into merge/master

Linux 3.6-rc1

Conflicts: net/batman-adv/bridge_loop_avoidance.c net/batman-adv/bridge_loop_avoidance.h net/batman-adv/hash.h net/batman-adv/soft-interface.c net/batman-adv/types.h