summaryrefslogtreecommitdiff
path: root/arch/microblaze/kernel/cpu/cpuinfo.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-05-10 03:42:10 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-05-10 03:42:10 +0400
commit70eba4226d9718946941c7be0c8cb66d431e7686 (patch)
tree822ba5d9751731d954895e69cf1456cb803ff944 /arch/microblaze/kernel/cpu/cpuinfo.c
parent2d4fe27850420606155fb1f7d18ab2b40153e67b (diff)
parent47110b88912a997f25d42373e339804d51da98de (diff)
downloadlinux-70eba4226d9718946941c7be0c8cb66d431e7686.tar.xz
Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull trivial pstore update from Tony Luck: "Couple of pstore cleanups" It turns out that the kmemdup() conversion ends up being undone by the fact that the memory block also needed the ecc information (see commit bd08ec33b5c2: "pstore/ram: Restore ecc information block"), so all that remains after merging is the error return code change. * tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux: pstore/ram: fix error return code in ramoops_probe() fs: pstore: Replaced calls to kmalloc and memcpy with kmemdup
Diffstat (limited to 'arch/microblaze/kernel/cpu/cpuinfo.c')
0 files changed, 0 insertions, 0 deletions