From: Linus Torvalds Date: Sun, 13 Jul 2014 19:04:06 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux... X-Git-Tag: Ubuntu-5.2.0-15.16~13197 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=33fe3aee03acd51fabce00e1bdf39ab5e7d10340;p=mirror_ubuntu-eoan-kernel.git Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k Pull m68k fixes from Geert Uytterhoeven: "Summary: - Fix for a boot regression introduced in v3.16-rc1, - Fix for a build issue in -next" Christoph Hellwig questioned why mach_random_get_entropy should be exported to modules, and Geert explains that random_get_entropy() is called by at least the crypto layer and ends up using it on m68k. On most other architectures it just uses get_cycles() (which is typically inlined and doesn't need exporting), * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: Export mach_random_get_entropy to modules m68k: Fix boot regression on machines with RAM at non-zero --- 33fe3aee03acd51fabce00e1bdf39ab5e7d10340