summaryrefslogtreecommitdiff
path: root/fs/dlm
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2015-06-12 02:36:32 +0300
committerKevin Hilman <khilman@linaro.org>2015-06-12 02:36:32 +0300
commit2879e43f09122f8b3ef5456e3d7e48716b086e60 (patch)
tree0399726ae8acb415504a8b4878f341b643ad3bf4 /fs/dlm
parent4d48614ec45aa20d6a2cb7d2eb1368d7641c747d (diff)
parent436bbc12452c23b9e7385f3fcabc82fdd387a55a (diff)
downloadlinux-2879e43f09122f8b3ef5456e3d7e48716b086e60.tar.xz
Merge tag 'omap-for-v4.2/soc-pt1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
Omap hwmod changes for v4.2 via Paul Walmsley <paul@pwsan.com>: Several OMAP2+ hwmod changes for v4.2. One patch cleans up a nasty interaction between the OMAP GPMC and the hwmod code when debugging is enabled. IP block integration data has been added for the AM43xx EMIF RAM controller. There's also a fix for the omap-aes driver when used in QEMU. And finally, some changes to the OMAP3 hwmod code to support the use of the security IP blocks (AES and SHA) on GP devices, or when they've specifically been enabled in the DT data. Basic build, boot, and power management test results are here: http://www.pwsan.com/omap/testlogs/omap-hwmod-a-for-v4.2/20150601192349/ * tag 'omap-for-v4.2/soc-pt1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP3: Fix crypto support for HS devices ARM: OMAP2+: Return correct error values from device and hwmod ARM: OMAP: AM43xx hwmod: Add data for am43xx emif hwmod memory: omap-gpmc: Add Kconfig option for debug
Diffstat (limited to 'fs/dlm')
0 files changed, 0 insertions, 0 deletions