From: Linus Torvalds Date: Wed, 19 Jun 2013 16:19:46 +0000 (-1000) Subject: Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm X-Git-Tag: v3.10-rc7~25 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=262fd6ff408dd6b89831a8ea14c2abd59452cfdd;p=~emulex%2Finfiniband.git Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm Pull ARM fixes from Russell King: "The larger changes this time are - "ARM: 7755/1: handle user space mapped pages in flush_kernel_dcache_page" which fixes more data corruption problems with O_DIRECT - "ARM: 7759/1: decouple CPU offlining from reboot/shutdown" which gets us back to working shutdown/reboot on SMP platforms - "ARM: 7752/1: errata: LoUIS bit field in CLIDR register is incorrect" which fixes a shutdown regression found in v3.10 on Versatile Express platforms. The remainder are the quite small, maybe one or two line changes" * 'fixes' of git://git.linaro.org/people/rmk/linux-arm: ARM: 7759/1: decouple CPU offlining from reboot/shutdown ARM: 7756/1: zImage/virt: remove hyp-stub.S during distclean ARM: 7755/1: handle user space mapped pages in flush_kernel_dcache_page ARM: 7754/1: Fix the CPU ID and the mask associated to the PJ4B ARM: 7753/1: map_init_section flushes incorrect pmd ARM: 7752/1: errata: LoUIS bit field in CLIDR register is incorrect --- 262fd6ff408dd6b89831a8ea14c2abd59452cfdd