tree e146cd87948eb11eb195d463b49dc8b1bdeb0db0
parent 0021213ea39d6a889b6ed6e24dc1c2142ae175bf
parent 515d3af751f58f1645d09f0a750b759cdc7820c3
author JP Abgrall <jpa@google.com> 1392413220 -0800
committer JP Abgrall <jpa@google.com> 1392413220 -0800

Merge remote-tracking branch 'upstream_linaro/linaro-libnl2_0'

* upstream_linaro/linaro-libnl2_0: (159 commits)
  Updating group definition to follow 3.13 kernel
  Adding version.h
  Adding support for netlink API and quota in nfaccounting
  Compile 2.0 with Kitkat
  Don't include pktloc_syntax.h in BUILT_SOURCES
  route_obj: don't add empty destination to nlmsg
  automake: add ${top_builddir}/include to AM_CFLAGS
  Use CPPFLAGS
  Put preprocessor definitions in AM_CPPFLAGS
  add user data to change_func_t for caches
  Trivial fix for TBF memleak
  libnl: optionally disable cli tools.
  Ignore vim swap files
  Let git ignore generated pktloc source files
  Fix compile warning in utils.c
  Fix compile warning in nl.c
  Packet Location Interface
  src/nf-queue.c: cleanup and improve performance of test program for NF_QUEUE
  Don't install private header files.
  object: fix attribute comparison
  ...

Conflicts:
	Android.mk
	include/linux/netfilter/nfnetlink.h

Change-Id: I383749ca16113b2ae8cfc7729aee8bbc8a36dc9e