aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-13 21:29:38 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-13 21:29:38 -0800
commit3474cbd11df8cdd6413781ea95bd51dd469098ff (patch)
treec8d78f415c00bad503541bee6dd68055997c3ad7 /arch
parentd89b218b801fd93ea95880f1c7fde348cbcc51c5 (diff)
parent2d378b9179881b46a0faf11430efb421fe03ddd8 (diff)
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')
0 files changed, 0 insertions, 0 deletions