Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

Browse source

Pull powerpc updates from Benjamin Herrenschmidt:
 "Kumar sent me a handful of Freescale related fixes and I added another
  regression fix to the pile.

  PS.  I -will- eventually learn about that signed tag business :-)"

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/kvm/book3s_32: Fix MTMSR_EERI macro
  powerpc/85xx: p1022ds: fix DIU/LBC switching with NAND enabled
  powerpc/85xx: p1022ds: disable the NAND flash node if video is enabled
  powerpc/85xx: Fix sram_offset parameter type
  powerpc/85xx: P3041DS - change espi input-clock from 40MHz to 35MHz
  powerpc/85xx: Fix pci base address error for p2020rdb-pc in dts

...

This commit is contained in:

Linus Torvalds 2012-07-31 15:33:04 -07:00

parent 26847fa6eb ad36cb0d1d

commit ec7a19bfec

7 changed files with 121 additions and 55 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

4

arch/powerpc/boot/dts/p2020rdb-pc_32b.dts

View file

4

arch/powerpc/boot/dts/p2020rdb-pc_36b.dts

View file

2

arch/powerpc/boot/dts/p3041ds.dts

View file

1

arch/powerpc/kvm/book3s_rmhandlers.S

View file

122

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

View file

4

arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h

View file

39

arch/powerpc/sysdev/fsl_85xx_l2ctlr.c

View file