]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2347152 2eeddb8)
Merge branch 'pull/l3noc/dts-fixes' of https://github.com/nmenon/linux-2.6-playground...
authorTony Lindgren <tony@atomide.com>
Thu, 8 May 2014 15:02:57 +0000 (08:02 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 8 May 2014 15:02:57 +0000 (08:02 -0700)
1  2 
arch/arm/boot/dts/am4372.dtsi patch | diff1 | diff2 | blob | history
arch/arm/boot/dts/dra7.dtsi patch | diff1 | diff2 | blob | history

diff --cc arch/arm/boot/dts/am4372.dtsi
Simple merge
diff --cc arch/arm/boot/dts/dra7.dtsi
Simple merge
Unnamed repository; edit this file 'description' to name the repository.