projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 005c79b b98ac70)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 5 Feb 2009 00:52:41 +0000 (16:52 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 5 Feb 2009 00:52:41 +0000 (16:52 -0800)
1  2 
drivers/net/cxgb3/sge.c patch | diff1 | diff2 | blob | history
drivers/net/gianfar.c patch | diff1 | diff2 | blob | history
drivers/net/gianfar.h patch | diff1 | diff2 | blob | history

diff --cc drivers/net/cxgb3/sge.c
Simple merge
diff --cc drivers/net/gianfar.c
Simple merge
diff --cc drivers/net/gianfar.h
Simple merge
John Crispins staging tree