diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-16 16:57:48 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-16 16:57:48 +0900 |
| commit | 7710601a8b24a3f77ebdfc7b213c21344c650987 (patch) | |
| tree | fbea2187b1d65430356fd4697f8db7433a28f272 /arch/arm/boot | |
| parent | 13beb8851e931b3cfb3403c3a62bfee9ab27a60c (diff) | |
| parent | e60dc703729b117d0b617249bcae373a430ebade (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/of' into linux-linaro-lsk
Conflicts:
arch/powerpc/kernel/prom.c
drivers/of/Kconfig
drivers/of/Makefile
drivers/of/selftest.c
include/linux/of.h
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/testcases/tests-phandle.dtsi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/testcases/tests-phandle.dtsi b/arch/arm/boot/dts/testcases/tests-phandle.dtsi index 0007d3cd7dc2..788a4c24b8f5 100644 --- a/arch/arm/boot/dts/testcases/tests-phandle.dtsi +++ b/arch/arm/boot/dts/testcases/tests-phandle.dtsi @@ -1,6 +1,9 @@ / { testcase-data { + security-password = "password"; + duplicate-name = "duplicate"; + duplicate-name { }; phandle-tests { provider0: provider0 { #phandle-cells = <0>; |