aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/main.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-04-18 00:20:57 -0400
committerDavid S. Miller <davem@davemloft.net>2013-04-18 00:20:57 -0400
commitea2f2fa143ead1a9bf5ce87a3abe403694fe6d78 (patch)
treec5aedcc1ed4a9e9375e595de2cb189b8345c4d96 /net/batman-adv/main.h
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client (diff)
parentopenvswitch: correct an invalid BUG_ON (diff)
downloadlinux-dev-ea2f2fa143ead1a9bf5ce87a3abe403694fe6d78.tar.xz
linux-dev-ea2f2fa143ead1a9bf5ce87a3abe403694fe6d78.zip
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
Jesse Gross says: ==================== Two small bug fixes for net/3.9 including the issue previously discussed where allocation of netlink notifications can fail after changes have been committed. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/main.h')
0 files changed, 0 insertions, 0 deletions