The following commit has been merged in the merge/master branch: commit 58ad6a50d49f703efc4b19f52256bf3c31113c0b Merge: 951874dabd1c8766e74905ed5bff691b8c04e6f3 46360b2a2df3226e9c69ae1e9e7d64b6f18dcf4b Author: Antonio Quartulli ordex@autistici.org Date: Mon Jan 28 20:35:51 2013 +0100
Merge remote-tracking branch 'pkg/next' into merge/master
diff --combined net/batman-adv/translation-table.c index fb15b4c,d44672f..d44672f --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@@ -517,8 -517,8 +517,8 @@@ int batadv_tt_local_seq_print_text(stru BATADV_TT_CLIENT_PENDING ? 'X' : '.'), (tt_common_entry->flags & BATADV_TT_CLIENT_WIFI ? 'W' : '.'), - no_purge ? last_seen_secs : 0, - no_purge ? last_seen_msecs : 0); + no_purge ? 0 : last_seen_secs, + no_purge ? 0 : last_seen_msecs); } rcu_read_unlock(); }