From: Linus Torvalds Date: Sun, 30 Nov 2008 22:04:31 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 X-Git-Tag: v2.6.28-rc7~39 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=a6e470fd1bbfea8e51d2b10b0713e802b782f19a;hp=-c;p=linux-2.6-omap-h63xx.git 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: 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 --- a6e470fd1bbfea8e51d2b10b0713e802b782f19a