summaryrefslogtreecommitdiff
path: root/net/ceph/crypto.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-03-15 22:17:17 +0100
committerArnd Bergmann <arnd@arndb.de>2013-03-15 22:17:17 +0100
commit831bbbeb2b0341a82a464896be49493c104d78f0 (patch)
tree7b4f593eb1d481a82b59f2c2a804e6c2632b32f0 /net/ceph/crypto.h
parentf6161aa153581da4a3867a2d1a7caf4be19b6ec9 (diff)
parent924e82dacab9a0b2ea661c57c98112569267f0db (diff)
Merge tag 'ux500-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/fixes-non-critical
From Linus Walleij <linus.walleij@linaro.org>: Ux500 Device Tree fixes All are necessary to make a proper DT boot on the v3.9 series: - IRQ edges. - Register defines. - FSMC clock. - Ethernet clk fixup (one patch to drivers/net ACKed by David Miller) - Proper IOS and regulator voltages for MMCI. - AB8500 GPIOs restored after they were fixed in the v3.9 merge window from the pinctrl tree. - There is also a minor cleanup in the platform code, but it is strongly connected to the other patches. * tag 'ux500-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: ARM: ux500: allow Snowball access to the AB8500 GPIO pins ARM: ux500: enable AB8500 GPIO for HREF ARM: ux500: Remove traces of the ios_handler from platform code ARM: ux500: Use the GPIO regulator framework for SDI0's 'en' and 'vsel' ARM: ux500: Setup correct settling time for the MMCI regulator ARM: ux500: Use the correct name when supplying a GPIO enable pin ARM: ux500: Specify which IOS regulator to use for MMCI ARM: ux500: Specify the ux5x0 MMCI regulator's on/off GPIO as high-enable ARM: ux500: Set correct MMCI regulator voltages in the ux5x0 Device Tree mmc: mmci: Move ios_handler functionality into the driver net/smsc911x: Provide common clock functionality clk: ux500: Provide an alias for the SMSC911x Ethernet chip clk: ux500: Ensure the FMSC clock is obtainable ARM: ux500: Provide a means to obtain the SMSC9115 clock when DT is enabled ARM: ux500: Include the PRCMU's Secure Registers in DB8500's DT ARM: ux500: Change IRQ from low-to-high edge triggered to high-to-low Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'net/ceph/crypto.h')
0 files changed, 0 insertions, 0 deletions