]> 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, 30 Apr 2014 01:47:53 +0000 (11:47 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Apr 2014 01:47:53 +0000 (11:47 +1000)
commit1b1cb2b8a977a65f50564f1ab411befa41c65b99
tree08b58e85533f1e6ad5648568c16845d20d474c3f
parent3e1bc5bf5bfb19a2f9a71adae0121106d0fb2a2d
parented036f809a4286a76d078a5be121a5d523d6ecdd
Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/ethernet/altera/altera_sgdma.c
net/netlink/af_netlink.c
12 files changed:
MAINTAINERS
drivers/net/bonding/bond_sysfs.c
drivers/net/can/c_can/c_can_pci.c
drivers/net/ethernet/altera/altera_msgdma.c
drivers/net/ethernet/altera/altera_sgdma.c
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
include/linux/netlink.h
kernel/audit.c
net/netfilter/nfnetlink.c
net/netlink/af_netlink.c
net/sched/cls_api.c