projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d455e5b 12186be)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 3 Jun 2009 09:43:41 +0000 (02:43 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 3 Jun 2009 09:43:41 +0000 (02:43 -0700)
commitb2f8f7525c8aa1fdd8ad8c72c832dfb571d5f768
tree71ae1801d264bca62efa0d22376b49de7f206e9atree | snapshot
parentd455e5b165a367a628110ec2d18807ea10052cd1commit | diff
parent12186be7d2e1106cede1cc728526e3d7998cbe94commit | diff
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/forcedeth.c
20 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/3c509.c diff1 | diff2 | blob | history
drivers/net/Makefile diff1 | diff2 | blob | history
drivers/net/atl1e/atl1e_main.c diff1 | diff2 | blob | history
drivers/net/atlx/atl1.c diff1 | diff2 | blob | history
drivers/net/bfin_mac.c diff1 | diff2 | blob | history
drivers/net/cxgb3/adapter.h diff1 | diff2 | blob | history
drivers/net/cxgb3/cxgb3_main.c diff1 | diff2 | blob | history
drivers/net/cxgb3/sge.c diff1 | diff2 | blob | history
drivers/net/cxgb3/t3_hw.c diff1 | diff2 | blob | history
drivers/net/e1000/e1000_main.c diff1 | diff2 | blob | history
drivers/net/forcedeth.c diff1 | diff2 | blob | history
drivers/net/gianfar.h diff1 | diff2 | blob | history
drivers/net/mac8390.c diff1 | diff2 | blob | history
drivers/net/mlx4/en_tx.c diff1 | diff2 | blob | history
drivers/net/r8169.c diff1 | diff2 | blob | history
drivers/net/wireless/Kconfig diff1 | diff2 | blob | history
drivers/net/wireless/at76c50x-usb.c diff1 | diff2 | blob | history
drivers/net/wireless/rtl818x/rtl8187_dev.c diff1 | diff2 | blob | history
net/sched/cls_cgroup.c diff1 | diff2 | blob | history
John Crispins staging tree