From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 29 Nov 2010 22:10:44 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
X-Git-Tag: upstream/snapshot3+hdmi~12349
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=555bdaefd52c386e79f98591810ceb8bab780398;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.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:
  EDAC: Fix typos in Documentation/edac.txt
  EDAC, MCE: Fix edac_init_mce_inject error handling
  EDAC: Remove deprecated kbuild goal definitions
---

555bdaefd52c386e79f98591810ceb8bab780398