• L
    Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 489de302
    Linus Torvalds 提交于
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (209 commits)
      [POWERPC] Create add_rtc() function to enable the RTC CMOS driver
      [POWERPC] Add H_ILLAN_ATTRIBUTES hcall number
      [POWERPC] xilinxfb: Parameterize xilinxfb platform device registration
      [POWERPC] Oprofile support for Power 5++
      [POWERPC] Enable arbitary speed tty ioctls and split input/output speed
      [POWERPC] Make drivers/char/hvc_console.c:khvcd() static
      [POWERPC] Remove dead code for preventing pread() and pwrite() calls
      [POWERPC] Remove unnecessary #undef printk from prom.c
      [POWERPC] Fix typo in Ebony default DTS
      [POWERPC] Check for NULL ppc_md.init_IRQ() before calling
      [POWERPC] Remove extra return statement
      [POWERPC] pasemi: Don't auto-select CONFIG_EMBEDDED
      [POWERPC] pasemi: Rename platform
      [POWERPC] arch/powerpc/kernel/sysfs.c: Move NUMA exports
      [POWERPC] Add __read_mostly support for powerpc
      [POWERPC] Modify sched_clock() to make CONFIG_PRINTK_TIME more sane
      [POWERPC] Create a dummy zImage if no valid platform has been selected
      [POWERPC] PS3: Bootwrapper support.
      [POWERPC] powermac i2c: Use mutex
      [POWERPC] Schedule removal of arch/ppc
      ...
    
    Fixed up conflicts manually in:
    
    	Documentation/feature-removal-schedule.txt
    	arch/powerpc/kernel/pci_32.c
    	arch/powerpc/kernel/pci_64.c
    	include/asm-powerpc/pci.h
    
    and asked the powerpc people to double-check the result..
    489de302
pgtable-ppc32.h 26.9 KB