diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-02 17:23:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-02 17:23:21 -0800 |
| commit | 483847a70262f7361f8a6f78513c985c2c8b1719 (patch) | |
| tree | ff20664482e00197f455cec70f450310fab8d78c /drivers/video | |
| parent | Merge tag 'for-linus' of git://github.com/openrisc/linux (diff) | |
| parent | crypto: hisilicon - fix a NULL vs IS_ERR() bug in sec_create_qp_ctx() (diff) | |
| download | linux-dev-483847a70262f7361f8a6f78513c985c2c8b1719.tar.xz linux-dev-483847a70262f7361f8a6f78513c985c2c8b1719.zip | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
- Fix build error in crypto lib code when crypto API is off
- Fix NULL/error check in hisilicon
- Fix Kconfig-related build error in talitos
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: hisilicon - fix a NULL vs IS_ERR() bug in sec_create_qp_ctx()
crypto: talitos - Fix build error by selecting LIB_DES
crypto: arch - conditionalize crypto api in arch glue for lib code
Diffstat (limited to 'drivers/video')
0 files changed, 0 insertions, 0 deletions