commit 29a41e9e029d21c306e3ad6e723700348b04706a
author Linus Torvalds <torvalds@linux-foundation.org> Fri Jan 09 11:53:07 2009 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Jan 09 11:53:07 2009 -0800
tree 3c7f807016a1e16c70992bbcba1269ac4cfe2fa5
parent d9e8a3a5b8298a3c814ed37ac5756e6f67b6be41
parent ae16489eb1175066c8f3008fc3c0396c525e1906

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  parisc: export length of os_hpmc vector
  parisc: fix kernel crash (protection id trap) when compiling ruby1.9
  parisc: Use DEFINE_SPINLOCK
  parisc: add uevent helper for parisc bus
  parisc: fix ipv6 checksum
  parisc: quiet palo not-found message from "which"
  parisc: Replace NR_CPUS in parisc code
  parisc: trivial fixes
  parisc: fix braino in commit adding __space_to_prot
  parisc: factor out sid to protid conversion
  parisc: use leX_to_cpu in place of __fswabX
  parisc: fix GFP_KERNEL use while atomic in unwinder
  parisc: remove dead BIO_VMERGE_BOUNDARY and BIO_VMERGE_MAX_SIZE definitions
  parisc: set_time() catch errors
  parisc: use the new byteorder headers
  parisc: drivers/parisc/: make code static
  parisc: lib/: make code static