From: Linus Torvalds Date: Thu, 31 May 2012 17:44:34 +0000 (-0700) Subject: Merge tag 'parisc-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6 X-Git-Tag: Ubuntu-5.0.0-8.9~15935 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=aac422afeffa9093544799c3257a96b55ba42044;p=mirror_ubuntu-disco-kernel.git Merge tag 'parisc-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6 Pull misc parisc updates from James Bottomley: "This is a couple of updates to complete our fixes and one to fix a compile failure caused during the merge window. Additionally, we now switch to the generic strncopy_from_user." * tag 'parisc-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6: [PARISC] update parisc to use generic strncpy_from_user() [PARISC] Fix parisc compile failure after smp: Add task_struct argument to __cpu_up() [PARISC] fix TLB fault path on PA2.0 narrow systems [PARISC] fix boot failure on 32-bit systems caused by branch stubs placed before .text --- aac422afeffa9093544799c3257a96b55ba42044