]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7f467cb 29d274b)
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Oct 2013 16:03:07 +0000 (09:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Oct 2013 16:03:07 +0000 (09:03 -0700)
commit413df1cb434b9b73b517f78c231549add1ee1c99
tree53450295a81a1c73e806bf9e49022a3df05a30f9tree | snapshot
parent7f467cbff66a9f96dc7b1ee619a3fa54a80d0c79commit | diff
parent29d274b8d3e2404cd1832b3a999b12f9d1e1d895commit | diff
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
Linux kernel for KaRo TX COM modules