diff options
| author | Nicolae Rosia <Nicolae_Rosia@mentor.com> | 2016-11-12 14:42:14 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-11-16 18:03:39 +0000 |
| commit | dab780a3b489b038a47d8fbbc49c33aae1e7a682 (patch) | |
| tree | c9599a6970c187f95f7875d2a3e948f05cef1e45 /include/uapi/scsi/fc/fc_fs.h | |
| parent | 1001354ca34179f3db924eb66672442a173147dc (diff) | |
regulator: twl-regulator: rework fixed regulator definition
TWL603X and TWL4030 are different and have different code logic.
Rework the regulator definition method so we can split the file
easily in twl4030 and twl6030.
Signed-off-by: Nicolae Rosia <Nicolae_Rosia@mentor.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include/uapi/scsi/fc/fc_fs.h')
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
- use-after-free in algif_aead
- modular aesni regression when pcbc is modular but absent
- bug causing IO page faults in ccp
- double list add in ccp
- NULL pointer dereference in qat (two patches)
- panic in chcr
- NULL pointer dereference in chcr
- out-of-bound access in chcr
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: chcr - Fix key length for RFC4106
crypto: algif_aead - Fix kernel panic on list_del
crypto: aesni - Fix failure when pcbc module is absent
crypto: ccp - Fix double add when creating new DMA command
crypto: ccp - Fix DMA operations when IOMMU is enabled
crypto: chcr - Check device is allocated before use
crypto: chcr - Fix panic on dma_unmap_sg
crypto: qat - zero esram only for DH85x devices
crypto: qat - fix bar discovery for c62x
Diffstat (limited to 'include/xen/interface/hvm')