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>
	Wed, 7 May 2014 02:36:10 +0000 (12:36 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 7 May 2014 02:36:10 +0000 (12:36 +1000)
commit	cdfe58e696190d10703d745b1962d10d2131e452
tree	a4c529496c37ebaa7eb3a9573e02e8d7e8f73ca7	tree \| snapshot
parent	6f196755b092815c936779d3d822d854f45bbcbe	commit \| diff
parent	79e0f1c9f2c7096e93879d4158f2d34142b693dd	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

33 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
include/net/cfg80211.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/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/sta_info.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/util.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
net/wireless/scan.c	diff1 \|	diff2 \|	blob \| history
net/wireless/sme.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
include/net/cfg80211.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/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/sta_info.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/util.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
net/wireless/scan.c	diff1 \|	diff2 \|	blob \| history
net/wireless/sme.c	diff1 \|	diff2 \|	blob \| history