From: Linus Torvalds Date: Mon, 1 Oct 2012 20:55:51 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux... X-Git-Tag: firefly_0821_release~3680^2~1972 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cdeb9b014331af4282be522824e36f3aa33f0671;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-linus' of git://git./linux/kernel/git/geert/linux-m68k Pull m68k updates from Geert Uytterhoeven: "All pretty boring, seems like all of us had better things to do last summer..." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR m68k/q40: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR m68k/amiga: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR m68k/apollo: Remove disabled definitions in apollohw.h --- cdeb9b014331af4282be522824e36f3aa33f0671