diff options
| author | Linus Torvalds | 2014-03-03 00:12:54 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2014-03-03 00:12:54 +0100 |
| commit | 9ff7aeb6247823e51b04d993478025f4591b9679 (patch) | |
| tree | 4749e90e746d30b55904162c88935628c280565d /net/xfrm/xfrm_user.c | |
| parent | Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | Merge iio fixes into staging-linus (diff) | |
| download | kernel-qcow2-linux-9ff7aeb6247823e51b04d993478025f4591b9679.tar.gz kernel-qcow2-linux-9ff7aeb6247823e51b04d993478025f4591b9679.tar.xz kernel-qcow2-linux-9ff7aeb6247823e51b04d993478025f4591b9679.zip | |
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 'net/xfrm/xfrm_user.c')
0 files changed, 0 insertions, 0 deletions