projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d81f087 21dccdd)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 20 May 2011 19:59:54 +0000 (12:59 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 20 May 2011 19:59:54 +0000 (12:59 -0700)
1  2 
arch/sparc/kernel/smp_32.c patch | diff1 | diff2 | blob | history
arch/sparc/kernel/time_32.c patch | diff1 | diff2 | blob | history

diff --cc arch/sparc/kernel/smp_32.c
Simple merge
diff --cc arch/sparc/kernel/time_32.c
Simple merge
John Crispins staging tree