git.maquefel.me Git - linux.git/commit

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 928f308 9b05126)

author	David S. Miller <davem@davemloft.net>
	Fri, 8 May 2009 09:48:30 +0000 (02:48 -0700)
committer	David S. Miller <davem@davemloft.net>
	Fri, 8 May 2009 09:48:30 +0000 (02:48 -0700)
commit	22f6dacdfcfdc792d068e9c41234808860498d04
tree	281a7d476f256ea3e2f800177ba685b169cc0540	tree \| snapshot
parent	928f308f556f4943e50c5064b546f47bce301f02	commit \| diff
parent	9b05126baa146fc3f41360164141d4e1b3ea93c4	commit \| diff

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

Conflicts:
include/net/tcp.h

12 files changed:

drivers/net/e1000/e1000_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ehea/ehea_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/igb/igb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-sta.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl3945-base.c	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.c	diff1 \|	diff2 \|	blob \| history
net/wireless/scan.c	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git