diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-22 13:23:35 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-22 13:23:35 -0700 |
commit | fb6f3d69af95006c0518be7fbcd73bff555c837d (patch) | |
tree | b4d054de7d79ba3c0690ead046135ba9b3a2604f /drivers/crypto | |
parent | 80868a36913e11cfcd06764699b4284d34be0e59 (diff) | |
parent | f98a4e2e8d50fe4b5ca6e8adac7e3161a47d29da (diff) | |
download | linux-fb6f3d69af95006c0518be7fbcd73bff555c837d.tar.bz2 |
Merge branch 'kirkwood/defconfig' of git://git.infradead.org/users/jcooper/linux into late/kirkwood
From Jason Cooper:
defconfig:
- update kirkwood_defconfig via 'make oldconfig'
- Add all Kirkwood DT boards to the defconfig
- enable SERIAL_OF_PLATFORM and ORION_WATCHDOG in kirkwood_defconfig
* 'kirkwood/defconfig' of git://git.infradead.org/users/jcooper/linux:
ARM: Kirkwood: add DT boards to defconfig
ARM: Kirkwood: update defconfig
Diffstat (limited to 'drivers/crypto')
0 files changed, 0 insertions, 0 deletions