Felix Janda (2):
      include: Sync with kernel headers
      src: Use stdint types everywhere

Florian Westphal (3):
      conntrack: labels: remove dead code
      qa: add cmp ATTR_ZONE regression test cases
      conntrack: compare: relax MARK/ZONE attribute comparision

Gustavo Zacarias (2):
      configure: uclinux is also linux
      src/Makefile.am: drop hardcoded -ldl

Ken-ichirou MATSUZAWA (10):
      conntrack: mnl: fix parsing payload len
      conntrack: remove duplicate code
      qa: update cmp ATTR_ZONE size mark and zone
      conntrack: api: add two new bitmask functions
      qa: add tests for new bitmask functions
      doc: fix symbol name typo in comment
      qa: build unshared nfct environment
      conntrack: add mark event filter
      qa: add test for mark event filter
      conntrack: fix stop timestamp assignment

Pablo Neira Ayuso (3):
      src: fix documentation regarding nfct_catch() and nfexp_catch()
      build: bump version to 1.0.5
      qa: Keep ct_echo_event and ct_mark_filter out from Makefile.am