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

Browse source

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Update a BKL related comment
  powerpc/mm: Fix module instruction tlb fault handling on Book-E 64
  powerpc: Fix call to subpage_protection()
  powerpc: Set CONFIG_32BIT on ppc32
  powerpc/mm: Fix build error in setup_initial_memory_limit
  powerpc/pseries: Don't override CONFIG_PPC_PSERIES_DEBUG
  powerpc: Fix div64 in bootloader

...

This commit is contained in:

Linus Torvalds 2010-11-18 07:38:58 -08:00

parent 0a5b871ea4 0f6b77ca12

commit 70b99eff75

9 changed files with 20 additions and 11 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/Kconfig

View file

3

arch/powerpc/boot/div64.S

View file

5

arch/powerpc/kernel/setup_64.c

View file

2

arch/powerpc/mm/hash_utils_64.c

View file

5

arch/powerpc/mm/tlb_low_64e.S

View file

2

arch/powerpc/mm/tlb_nohash.c

View file

6

arch/powerpc/platforms/pseries/Kconfig

View file

2

arch/powerpc/platforms/pseries/eeh.c

View file

2

arch/powerpc/platforms/pseries/pci_dlpar.c

View file