The following commit has been merged in the merge/master branch: commit 799e90a57330c488fe4d7ef26b84c76333173271 Author: Antonio Quartulli ordex@autistici.org Date: Tue Apr 24 10:07:11 2012 +0200

batman-adv: opening function bracket must be on a new line

Signed-off-by: Antonio Quartulli ordex@autistici.org

diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index db1694d..3108cd3 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -37,7 +37,8 @@ #ifdef CONFIG_BATMAN_ADV_DEBUG

static void bat_dbg_arp(struct bat_priv *bat_priv, struct sk_buff *skb, - uint16_t type, int hdr_size, char *msg) { + uint16_t type, int hdr_size, char *msg) +{ struct unicast_4addr_packet *unicast_4addr_packet;

if (msg)