Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
commita6e470fd1bbfea8e51d2b10b0713e802b782f19a
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Nov 2008 22:04:31 +0000 (30 14:04 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Nov 2008 22:04:31 +0000 (30 14:04 -0800)
tree7ec56441d0fc2130d2b9712eef4150c7825b0c8a
parent8e36a5d6ad587d906f0ff677974e5edb0335db30
parent90f671301a5e2678cdc99f611cd842161c3bb87f
Merge git://git./linux/kernel/git/kyle/parisc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  parisc: struct device - replace bus_id with dev_name(), dev_set_name()
  parisc: fix kernel crash when unwinding a userspace process
  parisc: __kernel_time_t is always long