projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 119c4b1 92d2040)
Merge branch 'master' into devel
authorRussell King <[email protected]>
Mon, 24 May 2010 22:08:54 +0000 (23:08 +0100)
committerRussell King <[email protected]>
Mon, 24 May 2010 22:08:54 +0000 (23:08 +0100)
1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/mach-mx2/devices.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/mach-mx2/devices.c
Simple merge
John Crispins staging tree