]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'net-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 01:24:21 +0000 (12:24 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 01:24:21 +0000 (12:24 +1100)
commit5c7a920b9ba2ed6bb51ebe9492c330a8d35d7121
tree0ced563df3f25661b2f63b67d386414eb35889a0
parentdcb315b3e836a1834b3fa8aab657296233ba352d
parent08f4fc9da9a04d59f5c937e06e375158abb68206
Merge remote-tracking branch 'net-next/master'

Conflicts:
net/bluetooth/l2cap_core.c
22 files changed:
Documentation/feature-removal-schedule.txt
MAINTAINERS
drivers/infiniband/core/cma.c
drivers/infiniband/hw/mlx4/main.c
drivers/net/ethernet/Makefile
drivers/net/ethernet/marvell/mv643xx_eth.c
drivers/net/ethernet/micrel/ks8842.c
drivers/net/ethernet/natsemi/macsonic.c
drivers/net/ethernet/realtek/r8169.c
drivers/net/ethernet/tile/tilepro.c
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
include/net/sctp/structs.h
mm/memcontrol.c
net/bluetooth/hci_conn.c
net/bluetooth/l2cap_core.c
net/bluetooth/rfcomm/core.c
net/ipv4/ipconfig.c
net/sctp/protocol.c
net/sctp/socket.c
net/sunrpc/svc.c
net/sunrpc/svc_xprt.c
net/sunrpc/svcsock.c