projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4e7682d 0af5e4c)
Merge branch 'sa11x0-mcp-fixes' into fixes
authorRussell King <[email protected]>
Thu, 26 Jan 2012 21:06:54 +0000 (21:06 +0000)
committerRussell King <[email protected]>
Thu, 26 Jan 2012 21:06:54 +0000 (21:06 +0000)
1  2 
arch/arm/mach-sa1100/collie.c patch | diff1 | diff2 | blob | history
arch/arm/mach-sa1100/generic.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-sa1100/collie.c
Simple merge
diff --cc arch/arm/mach-sa1100/generic.c
Simple merge
John Crispins staging tree