Merge tag 'please-pull-bp-edac' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Jul 2013 02:43:55 +0000 (19:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Jul 2013 02:43:55 +0000 (19:43 -0700)
commit04012e3076943f17c8cfc77a196701c8f0b8964f
tree1f516b94814fd5a55abbaae6f64c295c592853bc
parenta474902cf5c43465f88afbdfb4bd759205ef74aa
parent88d84ac97378c2f1d5fec9af1e8b7d9a662d6b00
Merge tag 'please-pull-bp-edac' of git://git./linux/kernel/git/ras/ras

Pull EDAC fix from Tony Luck:
 "Fix EDAC lockdep splat"

* tag 'please-pull-bp-edac' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  EDAC: Fix lockdep splat