From: Linus Torvalds Date: Tue, 15 Sep 2009 00:38:38 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp X-Git-Tag: v2.6.32-rc1~696 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f65ac45e20b03081ed64f41ce91bb982f8ac258d;p=profile%2Fcommon%2Fkernel-common.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: x86, mce: do not compile mcelog message on AMD EDAC, AMD: decode FR MCEs EDAC, AMD: decode load store MCEs EDAC, AMD: decode bus unit MCEs EDAC, AMD: decode instruction cache MCEs EDAC, AMD: decode data cache MCEs EDAC, AMD: carve out decoding of MCi_STATUS ErrorCode EDAC, AMD: carve out MCi_STATUS decoding x86, mce: pass mce info to EDAC for decoding amd64_edac: cleanup amd64_decode_bus_error amd64_edac: remove memory and GART TLB error decoders amd64_edac: cleanup/complete NB MCE decoding amd64_edac: cleanup amd64_process_error_info EDAC: beef up ErrorCodeExt error signatures EDAC: move MCE error descriptions to EDAC core --- f65ac45e20b03081ed64f41ce91bb982f8ac258d