diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-24 18:36:16 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-24 18:36:16 +0100 |
commit | 8b97be054572fc769619184dcc174e280a5c851c (patch) | |
tree | 7f277be8c9bf393ae0fc253a979aaab62426deef /drivers/char/tlclk.c | |
parent | Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/... (diff) | |
parent | staging: delete STE RMI4 hackish driver (diff) | |
download | linux-8b97be054572fc769619184dcc174e280a5c851c.tar.xz linux-8b97be054572fc769619184dcc174e280a5c851c.zip |
Merge tag 'staging-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver fixes from Greg KH:
"Here are some fixes that poped up due to the big staging tree merge,
as well as the removal of a staging driver that now is covered by a
"real" driver.
All of these have been in linux-next for a few days with no reported
issues"
* tag 'staging-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging: delete STE RMI4 hackish driver
staging: android: ion_test: fix check of platform_device_register_simple() error code
staging: wilc1000: fix a couple of memory leaks
staging: fsl-mc: fix incorrect type passed to dev_err macros
staging: fsl-mc: fix incorrect type passed to dev_dbg macros
staging: wilc1000: fixed kernel panic when firmware is not started
staging: comedi: ni_mio_common: fix the ni_write[blw]() functions
staging: most: hdm-dim2: Remove possible dereference error
staging: lustre: checking for NULL instead of IS_ERR
staging: lustre: really make lustre dependent on LNet
staging: refresh TODO for rtl8712
staging: refresh TODO for rtl8723au
Diffstat (limited to 'drivers/char/tlclk.c')
0 files changed, 0 insertions, 0 deletions