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: Add missing sparsemem.h include
  powerpc/pci: mmap anonymous memory when legacy_mem doesn't exist
  powerpc/cell: Add missing #include for oprofile
  powerpc/ftrace: Fix math to calculate offset in TOC
  powerpc: Don't emulate mr. instructions
  powerpc/fsl-booke: Fix mapping functions to use phys_addr_t
  arch/powerpc: Eliminate double sizeof
  powerpc/cpm2: Fix set interrupt type
  powerpc/83xx: Fix TSEC0 workability on MPC8313E-RDB boards
  powerpc/83xx: Fix missing #{address,size}-cells in mpc8313erdb.dts
  powerpc/83xx: Build breakage for CONFIG_PM but no CONFIG_SUSPEND

...

This commit is contained in:

Linus Torvalds 2009-02-10 11:55:12 -08:00

parent 226b79104f 0b2f82872f

commit c36c63c511

12 changed files with 34 additions and 19 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

11

arch/powerpc/boot/dts/mpc8313erdb.dts

View file

2

arch/powerpc/configs/83xx/mpc8313_rdb_defconfig

View file

5

arch/powerpc/kernel/ftrace.c

View file

17

arch/powerpc/kernel/pci-common.c

View file

2

arch/powerpc/lib/sstep.c

View file

4

arch/powerpc/mm/fsl_booke_mmu.c

View file

4

arch/powerpc/mm/pgtable_32.c

View file

1

arch/powerpc/oprofile/cell/spu_profiler.c

View file

2

arch/powerpc/platforms/82xx/pq2ads-pci-pic.c

View file

1

arch/powerpc/platforms/pseries/hotplug-memory.c

View file

2

arch/powerpc/sysdev/cpm2_pic.c

View file

2

arch/powerpc/sysdev/ipic.c

View file