Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Jan 2010 22:52:44 +0000 (14:52 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Jan 2010 22:52:44 +0000 (14:52 -0800)
commitbf0c346b3fbfb7315c5773767f3c7210fdeacce0
treec431ec864986f81b5849a5f15b2a0b81dee0c3fb
parent3b3ef30833cc85982b0b7e950998d86f5e2d28cf
parent926311fd7dabcd284a1e8a87a3e2bb5f929c0c60
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: Ensure index stays within bounds in amd64_get_scrub_rate