review.tizen.org Git - kernel/kernel-generic.git/commit

projects / kernel / kernel-generic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0b44191 65c3e47)

author	David S. Miller <davem@davemloft.net>
	Tue, 17 Jun 2008 01:25:48 +0000 (18:25 -0700)
committer	David S. Miller <davem@davemloft.net>
	Tue, 17 Jun 2008 01:25:48 +0000 (18:25 -0700)
commit	caea902f72b053fd0c76d0d3b6b2e057beb3fc64
tree	74e8d476b2c51480420e2ef7c9bbae249b6edbc9	tree \| snapshot
parent	0b4419162aa6c4204843f3a13b48d9ab821d3167	commit \| diff
parent	65c3e4715b1b934f8dcc002d9f46b4371ca7a9b1	commit \| diff

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:

drivers/net/wireless/rt2x00/Kconfig
drivers/net/wireless/rt2x00/rt2x00usb.c
net/sctp/protocol.c

16 files changed:

drivers/net/wireless/b43/b43.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/dma.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt73usb.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/inet_connection_sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/raw.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/sit.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/wext.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/wme.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_htb.c	diff1 \|	diff2 \|	blob \| history
net/sctp/associola.c	diff1 \|	diff2 \|	blob \| history
net/sctp/protocol.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Uncategorized;