summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 21:46:58 +0300
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 21:46:58 +0300
commite33f6635da037ed4d2634ee6bdf5c4d601946c18 (patch)
tree443367576b9a2e30eb32c9d1c422206c87e5a1ad /drivers
parent55850f47333c6e7d932e6426eaed863b27c9cd7f (diff)
parent38192d52f159bc06b7f523800c10b583cdd661d5 (diff)
downloadlinux-e33f6635da037ed4d2634ee6bdf5c4d601946c18.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]: Temporarily remove IOMMU merging code. [SPARC64]: Update defconfig. [SPARC]: Add new timerfd syscall entries.
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions