From: Linus Torvalds Date: Fri, 26 Jun 2009 16:39:40 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp X-Git-Tag: firefly_0821_release~13576 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4075ea8c54a7506844a69f674990241e7766357b;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-linus' of git://git./linux/kernel/git/bp/bp * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: amd64_edac: misc small cleanups amd64_edac: fix ecc_enable_override handling amd64_edac: check only ECC bit in amd64_determine_edac_cap --- 4075ea8c54a7506844a69f674990241e7766357b