From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 4 Oct 2013 16:03:07 +0000 (-0700)
Subject: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.12-rc4~20
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=413df1cb434b9b73b517f78c231549add1ee1c99;p=karo-tx-linux.git

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
---

413df1cb434b9b73b517f78c231549add1ee1c99