Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next

Browse source

Merge changes from Scott:
  Includes a couple of device tree fixes, a spelling fix, and leftover
  code cleanup.

...

This commit is contained in:

Michael Ellerman 2019-11-18 22:26:59 +11:00

parent 0695f8bca9 a76bea0287

commit 98ba8e8013

8 changed files with 48 additions and 36 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

52

arch/powerpc/boot/dts/fsl/kmcent2.dts

View file

2

arch/powerpc/kernel/cpu_setup_fsl_booke.S

View file

23

arch/powerpc/platforms/85xx/common.c

View file

2

arch/powerpc/platforms/85xx/corenet_generic.c

View file

2

arch/powerpc/platforms/85xx/mpc85xx.h

View file

1

arch/powerpc/platforms/85xx/mpc85xx_mds.c

View file

1

arch/powerpc/platforms/85xx/mpc85xx_rdb.c

View file

1

arch/powerpc/platforms/85xx/twr_p102x.c

View file