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: f576607 b45bd46)

author	Thierry Reding <treding@nvidia.com>
	Thu, 24 Oct 2013 12:35:23 +0000 (14:35 +0200)
committer	Thierry Reding <treding@nvidia.com>
	Thu, 24 Oct 2013 12:35:23 +0000 (14:35 +0200)
commit	d09f4bdc4b8feadbb3326d4e6e0890556b19bf07
tree	e1b85931bafb22b9c883393cb6bb15052611c409	tree \| snapshot
parent	f576607a662c24ffd99474e2afff503440c9a41d	commit \| diff
parent	b45bd46decd947eaa3497699d450e0851d247534	commit \| diff

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

Conflicts:
arch/h8300/include/uapi/asm/socket.h
arch/parisc/include/uapi/asm/socket.h

16 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/parisc/include/uapi/asm/socket.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/declance.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/b44.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/brocade/bna/bnad.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/emulex/benet/be_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igb/igb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2800usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00mac.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/sctp/ipv6.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules