Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
Linus Torvalds [Mon, 20 Oct 2008 21:38:14 +0000 (14:38 -0700)]
* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  parisc: convert to generic compat_sys_ptrace
  parisc: add rtc platform driver
  parisc: initialize unwinder much earlier
  parisc: add new syscalls
  parisc: hijack jump to start_kernel
  parisc: add pdc_coproc_cfg_unlocked and set_firmware_width_unlocked
  parisc: move include/asm-parisc to arch/parisc/include/asm
  parisc: move pdc_result to real2.S
  parisc: unify CCIO_COLLECT_STATS implementation
  parisc: add arch/parisc/kernel/.gitignore
  parisc: ropes.h - fix <asm-parisc/*> -> <asm/*>
  parisc: parisc-agp - fix <asm-parisc/*> -> <asm/*>

Resolve remove/rename conflict: include/asm-parisc/a.out.h is no longer
relevant.

1  2 
arch/parisc/Kconfig
arch/parisc/include/asm/elf.h
arch/parisc/include/asm/ide.h
arch/parisc/include/asm/siginfo.h
arch/parisc/include/asm/statfs.h
arch/parisc/include/asm/thread_info.h
arch/parisc/kernel/syscall_table.S
drivers/char/agp/parisc-agp.c
drivers/rtc/Kconfig
drivers/rtc/Makefile

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -610,9 -575,17 +610,17 @@@ config RTC_DRV_RS5C31
        help
          If you say yes here you get support for the Ricoh RS5C313 RTC chips.
  
+ config RTC_DRV_PARISC
+       tristate "PA-RISC firmware RTC support"
+       depends on PARISC
+       help
+         Say Y or M here to enable RTC support on PA-RISC systems using
+         firmware calls. If you do not know what you are doing, you should
+         just say Y.
  config RTC_DRV_PPC
         tristate "PowerPC machine dependent RTC support"
 -       depends on PPC_MERGE
 +       depends on PPC
         help
         The PowerPC kernel has machine-specific functions for accessing
         the RTC. This exposes that functionality through the generic RTC
Simple merge