projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 641cb85 af98441)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Sat, 20 Mar 2010 22:24:29 +0000 (15:24 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 20 Mar 2010 22:24:29 +0000 (15:24 -0700)
1  2 
drivers/net/ks8851.c patch | diff1 | diff2 | blob | history
include/linux/netdevice.h patch | diff1 | diff2 | blob | history
net/core/dev.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/ks8851.c
Simple merge
diff --cc include/linux/netdevice.h
Simple merge
diff --cc net/core/dev.c
Simple merge
Motorola kernel-slsi