• Linus Torvalds's avatar
    Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 723e9db7
    Linus Torvalds authored
    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (134 commits)
      powerpc/nvram: Enable use Generic NVRAM driver for different size chips
      powerpc/iseries: Fix oops reading from /proc/iSeries/mf/*/cmdline
      powerpc/ps3: Workaround for flash memory I/O error
      powerpc/booke: Don't set DABR on 64-bit BookE, use DAC1 instead
      powerpc/perf_counters: Reduce stack usage of power_check_constraints
      powerpc: Fix bug where perf_counters breaks oprofile
      powerpc/85xx: Fix SMP compile error and allow NULL for smp_ops
      powerpc/irq: Improve nanodoc
      powerpc: Fix some late PowerMac G5 with PCIe ATI graphics
      powerpc/fsl-booke: Use HW PTE format if CONFIG_PTE_64BIT
      powerpc/book3e: Add missing page sizes
      powerpc/pseries: Fix to handle slb resize across migration
      powerpc/powermac: Thermal control turns system off too eagerly
      powerpc/pci: Merge ppc32 and ppc64 versions of phb_scan()
      powerpc/405ex: support cuImage via included dtb
      powerpc/405ex: provide necessary fixup function to support cuImage
      powerpc/40x: Add support for the ESTeem 195E (PPC405EP) SBC
      powerpc/44x: Add Eiger AMCC (AppliedMicro) PPC460SX evaluation board support.
      powerpc/44x: Update Arches defconfig
      powerpc/44x: Update Arches dts
      ...
    
    Fix up conflicts in drivers/char/agp/uninorth-agp.c
    723e9db7
device.h 745 Bytes