]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1117830 75a3162)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 17 Jun 2008 01:25:48 +0000 (18:25 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 17 Jun 2008 01:25:48 +0000 (18:25 -0700)
commit0e179b58039c63803c81edffaf933adf20e9171e
tree74e8d476b2c51480420e2ef7c9bbae249b6edbc9tree | snapshot
parent11178306320ddb465c82322142a028f6fae84162commit | diff
parent75a31625216527cb190a75455be0fa4182231f59commit | diff
Merge branch 'master' of master.kernel.org:/pub/scm/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
Linux Kernel Source Tree.