Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

drivers/atm/zatm.c

drivers/net/irda/Kconfig

drivers/net/irda/Makefile

drivers/net/irda/sir-dev.h

drivers/net/irda/sir_core.c

drivers/net/irda/sir_dev.c

drivers/net/irda/sir_dongle.c

drivers/net/irda/sir_kthread.c

include/linux/netfilter_ipv4/ip_nat_protocol.h

include/linux/netfilter_ipv6.h

include/net/inet_connection_sock.h

net/8021q/vlan_dev.c

net/atm/br2684.c

net/atm/lec.c

net/atm/mpc.c

net/bluetooth/bnep/core.c

net/bluetooth/hci_conn.c

net/bridge/netfilter/ebt_ip.c

net/bridge/netfilter/ebt_stp.c

net/core/dv.c