git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3a07161 cf093b6)

author	David S. Miller <davem@davemloft.net>
	Thu, 14 Jul 2011 14:56:40 +0000 (07:56 -0700)
committer	David S. Miller <davem@davemloft.net>
	Thu, 14 Jul 2011 14:56:40 +0000 (07:56 -0700)
commit	c422ff65cc1ac49aa904a0e0208bda348a5587b9
tree	86b15d8cd3e25c97b348b5a61bdb16c02726a480	tree \| snapshot
parent	3a0716157ba2939f861dc328acbe32820ae8b7c8	commit \| diff
parent	cf093b6a8f45c8e9e68f72b061d3a1263b2eb7c0	commit \| diff

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
net/bluetooth/l2cap_core.c

19 files changed:

Documentation/networking/ip-sysctl.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/sh_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/slip.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vmxnet3/vmxnet3_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vmxnet3/vmxnet3_int.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/xmit.c	diff1 \|	diff2 \|	blob \| history
drivers/ssb/driver_pcicore.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_conn.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/l2cap_core.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/scan.c	diff1 \|	diff2 \|	blob \| history
net/sctp/outqueue.c	diff1 \|	diff2 \|	blob \| history
net/sctp/protocol.c	diff1 \|	diff2 \|	blob \| history
net/sctp/sm_sideeffect.c	diff1 \|	diff2 \|	blob \| history
net/sctp/sm_statefuns.c	diff1 \|	diff2 \|	blob \| history
net/sctp/socket.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history
net/wireless/scan.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.