tree 53450295a81a1c73e806bf9e49022a3df05a30f9
parent 7f467cbff66a9f96dc7b1ee619a3fa54a80d0c79
parent 29d274b8d3e2404cd1832b3a999b12f9d1e1d895
author Linus Torvalds <torvalds@linux-foundation.org> 1380902587 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1380902587 -0700

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Ingo Molnar:
 "Two simplefb fixes"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/simplefb: Mark framebuffer mem-resources as IORESOURCE_BUSY to avoid bootup warning
  x86/simplefb: Fix overflow causing bogus fall-back