Merge branch 'tipc-next'
authorDavid S. Miller <davem@davemloft.net>
Fri, 9 May 2014 05:41:09 +0000 (01:41 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 9 May 2014 05:41:09 +0000 (01:41 -0400)
commita3ab3c13f1fe6eea92468ddd1681d41e133fe703
tree8f08a86ecd8fc2b4fd35dc0ddc5bcec40194b61b
parent1b5d35358effb776b1ef47b26ec0df54af79d842
parentca9cf06a0654fcf4b114a5a2d08723fc45d00317
Merge branch 'tipc-next'

Ying Xue says:

====================
tipc: overhaul node action flags

We currently have two problems with the node flags field:
 - The naming of the individual action flags is unclear and confusing
 - The flags are often not cleared individually,  making it hard to follow
   where this happens.

So the series aims to solve above two problems.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>