From: Linus Torvalds Date: Thu, 11 Feb 2010 22:07:13 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp X-Git-Tag: Ubuntu-goldfish-3.4.0-4.27~8435 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=676ad585531e965416fd958747894541dabcec96;p=mirror_ubuntu-zesty-kernel.git Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: amd64_edac: Do not falsely trigger kerneloops --- 676ad585531e965416fd958747894541dabcec96