diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-18 03:55:56 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-18 03:55:56 +0100 |
commit | 6a488979f574cb4287880db2dbc8b13cee30c5be (patch) | |
tree | c5b00bbdc3f1388c1da5ff3595841316cae02c0b /net/ipv6/proc.c | |
parent | Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma (diff) | |
parent | Merge branch 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
download | linux-6a488979f574cb4287880db2dbc8b13cee30c5be.tar.xz linux-6a488979f574cb4287880db2dbc8b13cee30c5be.zip |
Merge tag 'arm-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
ARM: fixes for ARM platforms
Some fallout from the 3.3. merge window as well as a couple bug fixes
for older preexisting bugs that seem valid to include at this time:
* sched_clock changes broke picoxcell, fix included
* BSYM bugs causing issues with thumb2-built kernels on SMP
* Missing module.h include on msm.
* A collection of bugfixes for samsung platforms that didn't make it into
the first pull requests.
* tag 'arm-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: make BSYM macro assembly only
ARM: highbank: remove incorrect BSYM usage
ARM: imx: remove incorrect BSYM usage
ARM: exynos: remove incorrect BSYM usage
ARM: ux500: add missing ENDPROC to headsmp.S
ARM: msm: Add missing ENDPROC to headsmp.S
ARM: versatile: Add missing ENDPROC to headsmp.S
ARM: EXYNOS: Invert VCLK polarity for framebuffer on ORIGEN
ARM: S3C64XX: Fix interrupt configuration for PCA935x on Cragganmore
ARM: S3C64XX: Fix the memory mapped GPIOs on Cragganmore
ARM: S3C64XX: Remove hsmmc1 from Cragganmore
ARM: S3C64XX: Remove unconditional power domain disables
ARM: SAMSUNG: Declare struct platform_device in plat/s3c64xx-spi.h
ARM: SAMSUNG: dma-ops.h needs mach/dma.h
ARM: SAMSUNG: Guard against multiple inclusion of plat/dma.h
ARM: picoxcell: fix sched_clock() cleanup fallout
ARM: msm: vreg is a module and so needs module.h
Diffstat (limited to 'net/ipv6/proc.c')
0 files changed, 0 insertions, 0 deletions