summaryrefslogtreecommitdiffstats
path: root/net/atm/mpoa_proc.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-05-10 11:16:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-05-10 11:16:48 -0700
commit41f2a93cc6d13fa1c82db1281162500fcc57ba3e (patch)
tree7a58f9a8b664a5af0920831f8bff4eb419d93981 /net/atm/mpoa_proc.c
parent8425ac7a0d56731df5455c3015c59484f39eab6d (diff)
parent3b8786ff7a1b31645ae2c26a2ec32dbd42ac1094 (diff)
downloadop-kernel-dev-41f2a93cc6d13fa1c82db1281162500fcc57ba3e.zip
op-kernel-dev-41f2a93cc6d13fa1c82db1281162500fcc57ba3e.tar.gz
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King: "A set of ARM fixes: - fix an off-by-one error in the iommu DMA ops, which caused errors with a 4GiB size. - remove comments mentioning the non-existent CONFIG_CPU_ARM1020_CPU_IDLE macro. - remove useless CONFIG_CPU_ICACHE_STREAMING_DISABLE blocks, where this symbol never appeared in any Kconfig. - fix Feroceon code to cope with a previous change correctly (it incorrectly left an additional word in an assembly structure definition) - avoid a misleading IRQ affinity warning in the ARM PMU code for IRQs which are already affine to their CPUs. - fix the node name printed in the IRQ affinity warning" * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: ARM: 8352/1: perf: Fix the pmu node name in warning message ARM: 8351/1: perf: don't warn about missing interrupt-affinity property for PPIs ARM: 8350/1: proc-feroceon: Fix feroceon_proc_info macro ARM: 8349/1: arch/arm/mm/proc-arm925.S: remove dead #ifdef block ARM: 8348/1: remove comments on CPU_ARM1020_CPU_IDLE ARM: 8347/1: dma-mapping: fix off-by-one check in arm_setup_iommu_dma_ops
Diffstat (limited to 'net/atm/mpoa_proc.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud