anarkia1976/AK-berserk — pull request #4 by lioux (2013-03-22 11:55:02+00:00)
Title: Ak cylon 4.2.2 nf next

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6 as of 2011/07/21

This was the last nf-next-2.6 merge available.

Merge commit 'f5caadbb3d8fc0b71533e880c684b2230bdb76ac' into ak-cylon-4.2.2-nf-next

Conflicts:
drivers/Kconfig
drivers/Makefile
drivers/bluetooth/btusb.c
drivers/infiniband/core/addr.c
drivers/infiniband/hw/cxgb3/iwch_cm.c
drivers/infiniband/hw/cxgb4/cm.c
drivers/infiniband/hw/nes/nes_cm.c
drivers/infiniband/ulp/ipoib/ipoib_main.c
drivers/infiniband/ulp/ipoib/ipoib_multicast.c
drivers/net/benet/be_main.c
drivers/net/bnx2.c
drivers/net/cnic.c
drivers/net/r8169.c
drivers/net/sungem.c
drivers/net/tg3.c
drivers/net/wan/ixp4xx_hss.c
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/iwlegacy/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-tx.c
drivers/net/wireless/rt2x00/rt2800lib.c
drivers/net/wireless/rt2x00/rt2x00queue.c
include/linux/netlink.h
include/linux/nl80211.h
include/net/arp.h
include/net/bluetooth/hci_core.h
include/net/bluetooth/l2cap.h
include/net/bluetooth/mgmt.h
include/net/bluetooth/smp.h
include/net/cfg80211.h
include/net/dst.h
include/net/rtnetlink.h
lib/Makefile
net/Makefile
net/bluetooth/hci_conn.c
net/bluetooth/hci_core.c
net/bluetooth/hci_event.c
net/bluetooth/hci_sock.c
net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_sock.c
net/bluetooth/mgmt.c
net/bluetooth/rfcomm/sock.c
net/bluetooth/smp.c
net/bridge/br_netfilter.c
net/core/dst.c
net/core/neighbour.c
net/core/rtnetlink.c
net/decnet/dn_neigh.c
net/decnet/dn_route.c
net/ipv4/arp.c
net/ipv4/ip_output.c
net/ipv4/route.c
net/ipv6/addrconf.c
net/ipv6/ip6_fib.c
net/ipv6/ip6_output.c
net/ipv6/route.c
net/mac80211/mlme.c
net/mac80211/rc80211_minstrel_ht.c
net/mac80211/util.c
net/netfilter/nfnetlink.c
net/netlink/af_netlink.c
net/sched/sch_teql.c
net/wireless/mlme.c
net/wireless/nl80211.c
net/wireless/nl80211.h

The following files had patches regressed to allow for a complete build after the merge:

include/net/dst.h
include/net/ipv6.h
include/net/inet6_hashtables.h
include/net/transp_v6.h
net/ipv6/af_inet6.c
net/core/dst.c
net/ipv6/ip6_output.c
net/ipv6/tcp_ipv6.c
net/ipv6/udp.c
net/xfrm/xfrm_policy.c