diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-04 09:03:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-04 09:03:07 -0700 |
| commit | 413df1cb434b9b73b517f78c231549add1ee1c99 (patch) | |
| tree | 53450295a81a1c73e806bf9e49022a3df05a30f9 /arch/sparc/kernel/ldc.c | |
| parent | 7f467cbff66a9f96dc7b1ee619a3fa54a80d0c79 (diff) | |
| parent | 29d274b8d3e2404cd1832b3a999b12f9d1e1d895 (diff) | |
| download | linux-413df1cb434b9b73b517f78c231549add1ee1c99.tar.bz2 | |
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
Diffstat (limited to 'arch/sparc/kernel/ldc.c')
0 files changed, 0 insertions, 0 deletions