]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'depends/rmk-psci' into for-next
authorArnd Bergmann <arnd@arndb.de>
Tue, 19 Feb 2013 15:54:42 +0000 (16:54 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 19 Feb 2013 15:54:42 +0000 (16:54 +0100)
* depends/rmk-psci:
  ARM: psci: add support for PSCI invocations from the kernel
  ARM: psci: add devicetree binding for describing PSCI firmware
  ARM: opcodes: add opcodes definitions for ARM security extensions
  ARM: opcodes: add missing include of linux/linkage.h


Trivial merge