diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-02 15:12:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-02 15:12:54 -0800 |
| commit | 9ff7aeb6247823e51b04d993478025f4591b9679 (patch) | |
| tree | 4749e90e746d30b55904162c88935628c280565d /lib/dynamic_debug.c | |
| parent | 3154da34beff952a6b29dcc27c9dacf9adac977c (diff) | |
| parent | 9f4a9b83f13544df61efd3645308f64205dc8db9 (diff) | |
Merge tag 'staging-3.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging tree fixes from Greg KH:
"Here are a few IIO fixes, and a new device id for a staging driver for
3.14-rc5. All have been in linux-next for a while, I did a final
merge to get the IIO fixes into this tree, they were incorrectly in
the char-misc tree for a few weeks, and I forgot to tell you to pull
them from there. This makes it a single pull request for you"
* tag 'staging-3.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging: r8188eu: Add new device ID
staging:iio:adc:MXS:LRADC: fix touchscreen statemachine
iio:gyro: bug on L3GD20H gyroscope support
iio: cm32181: Change cm32181 ambient light sensor driver
iio: cm36651: Fix read/write integration time function.
Diffstat (limited to 'lib/dynamic_debug.c')
0 files changed, 0 insertions, 0 deletions