diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-01 13:20:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-01 13:20:47 -0800 |
| commit | fba7e99458b606dc9a84332d38cd40e9d367633f (patch) | |
| tree | b700406ccf5dc02f5c82d8f7e59ba1d57218f525 /fs/jfs/jfs_dmap.c | |
| parent | 3441456bfa326e9e16177cd13d0490ddd0e2fe0e (diff) | |
| parent | 28111dda37e653781efc73c06229f006739b3982 (diff) | |
| download | linux-fba7e99458b606dc9a84332d38cd40e9d367633f.tar.bz2 | |
Merge tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson:
"One more week's worth of fixes. Worth pointing out here are:
- A patch fixing detaching of iommu registrations when a device is
removed -- earlier the ops pointer wasn't managed properly
- Another set of Renesas boards get the same GIC setup fixup as
others have in previous -rcs
- Serial port aliases fixups for sunxi. We did the same to tegra but
we caught that in time before the merge window due to more machines
being affected. Here it took longer for anyone to notice.
- A couple more DT tweaks on sunxi
- A follow-up patch for the mvebu coherency disabling in last -rc
batch"
* tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
arm: dma-mapping: Set DMA IOMMU ops in arm_iommu_attach_device()
ARM: shmobile: r8a7790: Instantiate GIC from C board code in legacy builds
ARM: shmobile: r8a73a4: Instantiate GIC from C board code in legacy builds
ARM: mvebu: don't set the PL310 in I/O coherency mode when I/O coherency is disabled
ARM: sunxi: dt: Fix aliases
ARM: dts: sun4i: Add simplefb node with de_fe0-de_be0-lcd0-hdmi pipeline
ARM: dts: sun6i: ippo-q8h-v5: Fix serial0 alias
ARM: dts: sunxi: Fix usb-phy support for sun4i/sun5i
Diffstat (limited to 'fs/jfs/jfs_dmap.c')
0 files changed, 0 insertions, 0 deletions