diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-14 05:29:38 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-14 05:29:38 (GMT) |
commit | 3474cbd11df8cdd6413781ea95bd51dd469098ff (patch) | |
tree | c8d78f415c00bad503541bee6dd68055997c3ad7 /arch/x86 | |
parent | d89b218b801fd93ea95880f1c7fde348cbcc51c5 (diff) | |
parent | 2d378b9179881b46a0faf11430efb421fe03ddd8 (diff) | |
download | linux-fsl-qoriq-3474cbd11df8cdd6413781ea95bd51dd469098ff.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Add very basic XVR-1000 framebuffer driver.
qlogicpti: Remove slash in QlogicPTI irq name
Diffstat (limited to 'arch/x86')
0 files changed, 0 insertions, 0 deletions