git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8be45ea c25aaf8)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 2 May 2014 01:31:59 +0000 (11:31 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 2 May 2014 01:31:59 +0000 (11:31 +1000)
commit	70753265f451bc2b3e32ebdf3876af6719115c43
tree	11599605b177a233e4ecdab0516b6dadc07f0743	tree \| snapshot
parent	8be45ea1eef971984fef02a0682aad5e99e062fe	commit \| diff
parent	c25aaf814a63f9d9c4e45416f13d70ef0aa0be2e	commit \| diff

Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/ethernet/altera/altera_sgdma.c
net/netlink/af_netlink.c

16 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_sysfs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/c_can/c_can_pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/altera/altera_msgdma.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/altera/altera_sgdma.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/hyperv/netvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/macvlan.c	diff1 \|	diff2 \|	blob \| history
include/linux/netlink.h	diff1 \|	diff2 \|	blob \| history
kernel/audit.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nfnetlink.c	diff1 \|	diff2 \|	blob \| history
net/netlink/af_netlink.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_api.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules