diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-07 15:17:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-07 15:17:47 -0800 |
| commit | 63fee123da6a05b48695599c4349ab5de97da5e2 (patch) | |
| tree | 1048c2de1f2674a0a5b7e9f8cf2b815c83b77225 /security/smack | |
| parent | Merge tag 'usb-4.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb (diff) | |
| parent | mailbox: Fix dependencies for !HAS_IOMEM archs (diff) | |
| download | linux-dev-63fee123da6a05b48695599c4349ab5de97da5e2.tar.xz linux-dev-63fee123da6a05b48695599c4349ab5de97da5e2.zip | |
Merge branch 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu/integration
Pull mailbox fixes from Jassi Brar:
- fix getting element from the pcc-channels array by simply indexing
into it
- prevent building mailbox-test driver for archs that don't have IOMEM
* 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
mailbox: Fix dependencies for !HAS_IOMEM archs
mailbox: pcc: fix channel calculation in get_pcc_channel()
Diffstat (limited to 'security/smack')
0 files changed, 0 insertions, 0 deletions