diff options
author | Tejun Heo <tj@kernel.org> | 2014-11-22 15:32:08 +0100 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2014-11-22 15:32:08 +0100 |
commit | cceb9bd63373061ad7b75c321808a2fb11c86545 (patch) | |
tree | a70d939eabed2e19538707402441644dfc26990e /arch/arm/boot/dts/am335x-evm.dts | |
parent | percpu: Convert remaining __get_cpu_var uses in 3.18-rcX (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | linux-cceb9bd63373061ad7b75c321808a2fb11c86545.tar.xz linux-cceb9bd63373061ad7b75c321808a2fb11c86545.zip |
Merge branch 'master' into for-3.19
Pull in to receive 54ef6df3f3f1 ("rcu: Provide counterpart to
rcu_dereference() for non-RCU situations").
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/am335x-evm.dts')
-rw-r--r-- | arch/arm/boot/dts/am335x-evm.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts index e2156a583de7..c4b968f0feb5 100644 --- a/arch/arm/boot/dts/am335x-evm.dts +++ b/arch/arm/boot/dts/am335x-evm.dts @@ -489,7 +489,7 @@ reg = <0x00060000 0x00020000>; }; partition@4 { - label = "NAND.u-boot-spl"; + label = "NAND.u-boot-spl-os"; reg = <0x00080000 0x00040000>; }; partition@5 { |