git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx6qdl-sabresd.dtsi
diff --git
a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index 0a50705b9c1897101a1732cc4bc703ff907b5443..f019f990036907e3caba124382c3462ea6c5ee6c 100644
(file)
--- a/
arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/
arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@
-19,7
+19,7
@@
stdout-path = &uart1;
};
- memory {
+ memory
@10000000
{
reg = <0x10000000 0x40000000>;
};