summaryrefslogtreecommitdiffstats
path: root/crypto/asymmetric_keys/pkcs7_trust.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-10-26 06:27:33 +0100
committerOlof Johansson <olof@lixom.net>2015-10-26 06:27:33 +0100
commit64ebda3acd6ea592e6f97dcd0682e87aa7cf8d61 (patch)
tree04ab95e8bcb5046f08f96912d4af5a7d7987f003 /crypto/asymmetric_keys/pkcs7_trust.c
parentARM: dts: uniphier: add I2C aliases for ProXstream2 boards (diff)
parentARM: bcm2835: Add the DDC I2C controller to the device tree. (diff)
downloadlinux-64ebda3acd6ea592e6f97dcd0682e87aa7cf8d61.tar.xz
linux-64ebda3acd6ea592e6f97dcd0682e87aa7cf8d61.zip
Merge tag 'arm/soc/for-4.4/rpi-dt-v2' of https://github.com/Broadcom/stblinux into next/dt
This pull request contains the DT changes for BCM2835 in 4.4. It pulls in clk/clk-bcm2835 (which Stephen Boyd has said would be stable) because the DT changes to enable the clock driver need the driver itself to be present. These changes include the following: - Eric Anholt, moves the bcm2835 clock driver under bcm/ where it belongs with other Broadcom clock providers drivers, defines the binding for new clock driver, adds support for programming the BCM2835 audio domain, adds the DDC I2C controller to Device Tree, and finally migrates the Device Tree to use the new clock driver binding - Lubomir Rintel adds support for the Raspberry Pi Model A+ and B revision 2, and remove the I2S controller which is non-existent on Raspberry Pi Model B - Stefan Wahren adds an uart0 label for referencing the UART adapter * tag 'arm/soc/for-4.4/rpi-dt-v2' of https://github.com/Broadcom/stblinux: ARM: bcm2835: Add the DDC I2C controller to the device tree. ARM: bcm2835: Switch to using the new clock driver support. ARM: bcm2835: dt: Add Raspberry Pi Model A+ ARM: bcm2835: dt: Add Raspberry Pi Model B rev2 ARM: bcm2835: dt: Raspberry Pi Model B had no I2S ARM: bcm2835: add label for uart0 clk: bcm2835: Add support for programming the audio domain clocks clk: bcm2835: Add binding docs for the new platform clock driver. clk: bcm2835: Move under bcm/ with other Broadcom SoC clk drivers. Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'crypto/asymmetric_keys/pkcs7_trust.c')
0 files changed, 0 insertions, 0 deletions