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

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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 6 May 2014 02:01:50 +0000 (12:01 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 6 May 2014 02:01:50 +0000 (12:01 +1000)
commit	eeb1fa17661450541cb1f31a3070642d30abe5ec
tree	84a66e8c09e7c88e2c784e2b5925aca7ad8de815	tree \| snapshot
parent	cba70aa00cefdbbc61916f575d8ec1de0b3c5347	commit \| diff
parent	5a50a92784e4630f7b3e163ecd32ac3f783d9b4e	commit \| diff

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

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

27 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/am33xx.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/am4372.dtsi	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/e1000e/ich8lan.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
drivers/net/wireless/ath/ath9k/ath9k.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/recv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00mac.c	diff1 \|	diff2 \|	blob \| history
include/linux/netlink.h	diff1 \|	diff2 \|	blob \| history
kernel/audit.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_conn.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_event.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_cubic.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
net/sched/sch_api.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/am33xx.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/am4372.dtsi	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/e1000e/ich8lan.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
drivers/net/wireless/ath/ath9k/ath9k.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/recv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00mac.c	diff1 \|	diff2 \|	blob \| history
include/linux/netlink.h	diff1 \|	diff2 \|	blob \| history
kernel/audit.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_conn.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_event.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_cubic.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
net/sched/sch_api.c	diff1 \|	diff2 \|	blob \| history