summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-03-19 19:10:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-03-19 19:10:56 -0700
commit635440c0235537a3f0a90ed5b6f8cd8a5da862de (patch)
tree03eff0d444620fc32c54c16f66aed5ddeefd01ab /drivers/char
parentde7c6d15e354bc94a846f03749819768c331280a (diff)
parent93ce4e2d2d7404e80d5612fb1cc13d4aad5e42fc (diff)
downloadlinux-635440c0235537a3f0a90ed5b6f8cd8a5da862de.tar.bz2
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Update some defconfigs [POWERPC] Hide resources on Axon PCIE root complex nodes [POWERPC] Fix cell IOMMU code to cope with empty dma-ranges and non-PCI devices [POWERPC] Fix build failure for tqm8540 and sbc85xx defconfigs [POWERPC] Fix PMU + soft interrupt disable bug [POWERPC] user_regset PTRACE_SETREGS regression fix
Diffstat (limited to 'drivers/char')
0 files changed, 0 insertions, 0 deletions