]> git.kernelconcepts.de Git - mv-sheeva.git/commitdiff
projects / mv-sheeva.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c506653 ec30f34)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 24 Jan 2011 21:17:06 +0000 (13:17 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 24 Jan 2011 21:17:06 +0000 (13:17 -0800)
1  2 
drivers/net/bonding/bond_3ad.c patch | diff1 | diff2 | blob | history
net/core/dev.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/bonding/bond_3ad.c
Simple merge
diff --cc net/core/dev.c
Simple merge
Linux for Marvell Sheeva based platforms