summaryrefslogtreecommitdiffstats
path: root/drivers/crypto/caam/ctrl.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-11-22 16:47:28 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-22 16:47:28 -0800
commit2e7babfa892a55588467ef03b545002e32f31528 (patch)
tree55360de155bc832734732c82e57caa59aaf14ea0 /drivers/crypto/caam/ctrl.c
parent6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff)
parenta80e1053aaa395d94fff5ab7c73c89bb0c28c3c5 (diff)
Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86
Pull x86 platform driver updates from Matthew Garrett: "A moderate diffstat, but it's almost entirely just moving the chromebook driver into its own directory in order to ease ARM support, adding back rfkill support to the one Dell laptop model where it's expected to work, updates to the Intel IPC driver for hardware I've never actually seen and the usual set of small fixes" [ This actually came in before the merge window closed, and I had just missed it because it didn't match my git pull email pattern. - Linus ] * 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86: (24 commits) x86, wmi fix modalias_show return values ipc: Added support for IPC interrupt mode ipc: Handle error conditions in ipc command ipc: Enabled ipc support for additional intel platforms ipc: Added platform data structure thinkpad_acpi: Fix build error when CONFIG_SND_MAX_CARDS > 32 platform: add chrome platform directory hp-wmi: detect "2009 BIOS or later" flag by WMI 0x0d for wireless cmd dell-wmi: Add KEY_MICMUTE to bios_to_linux_keycode platform:x86: Remove OOM message after input_allocate_device sony-laptop: fixe typos in sony_laptop_input_keycode_map sony-laptop: warn on multiple KBD backlight handles dell-laptop: Only enable rfkill functionality on laptops with a hw killswitch dell-laptop: Add a force_rfkill module parameter dell-laptop: Wait less long before updating rfkill after an rfkill keypress dell-laptop: Do not skip setting blocked bit rfkill_set while hw-blocked dell-laptop: Sync current block state to BIOS on hw switch change dell-laptop: Allow changing the sw_state while the radio is blocked by hw dell-laptop: Don't read-back sw_state on machines with a hardware switch dell-laptop: Don't set sw_state from the query callback ...
Diffstat (limited to 'drivers/crypto/caam/ctrl.c')
0 files changed, 0 insertions, 0 deletions