From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Oct 2008 21:38:14 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
X-Git-Tag: v2.6.28-rc1~72
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3d2f927f788adcdabc42f8a1616f6cc56c53bbe;p=pandora-kernel.git

Merge git://git./linux/kernel/git/kyle/parisc-2.6

* 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.
---

e3d2f927f788adcdabc42f8a1616f6cc56c53bbe
Reading git-diff-tree failed