Skip to contentSkip to conversation

IIO enhancements for staging-next

GIT PULL Jonathan Cameron 2 participants 2 messages Jul 12, 2012 IIO

lore
Share & tools
lore

Jonathan Cameron

author maintainer
#0 lore raw

The following changes since commit c732a24c5a9392cf3738f5957e0d97d37c09e6e1:

staging:iio:adt7410: use local platformdata if none is specified
(2012-07-08 10:39:59 +0100)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git
tags/togreg-3.6a

for you to fetch changes up to bbdb822c4c3f8dbefd8f6dc84f6d98c33af6e051:

iio: add adjd_s311 I2C digital color sensor driver (2012-07-12
17:45:34 +0100)

----------------------------------------------------------------
One new driver and a couple of nice cleanups.

----------------------------------------------------------------
I'm still working on a coherent tag naming. Suggestions welcome!

Jon Brenner (1):
IIO channel type and modifiers for CCT and RGBC data

Jonathan Cameron (1):
iio: Trivial documentation fix to correct kernel version info in
21cd1fab058671313f7c178b640999fcd0d8de21

Lars-Peter Clausen (5):
iio: Add callback to check whether a scan mask is valid
iio: Introduce iio_validate_scan_mask_onehot staging:iio:ad7192: Use iio_validate_scan_mask_onehot staging:iio:ad7793: Use iio_validate_scan_mask_onehot staging:iio:ade7758: Use iio_validate_scan_mask_onehot

Peter Meerwald (1):
iio: add adjd_s311 I2C digital color sensor driver

 drivers/iio/industrialio-buffer.c                  |  43 ++-
 drivers/iio/industrialio-core.c                    |   5 +
 drivers/iio/light/Kconfig                          |  12 +
 drivers/iio/light/Makefile                         |   1 +
 drivers/iio/light/adjd_s311.c                      | 364
+++++++++++++++++++++
 .../staging/iio/Documentation/sysfs-bus-iio-light  |  23 ++
 drivers/staging/iio/adc/ad7192.c                   |  10 +-
 drivers/staging/iio/adc/ad7793.c                   |  14 +-
 drivers/staging/iio/meter/ade7758.h                |   1 -
 drivers/staging/iio/meter/ade7758_core.c           |   7 +-
 drivers/staging/iio/meter/ade7758_ring.c           |   1 +
 include/linux/iio/buffer.h                         |   3 +
 include/linux/iio/iio.h                            |   4 +
 include/linux/iio/types.h                          |   5 +
 14 files changed, 460 insertions(+), 33 deletions(-)
 create mode 100644 drivers/iio/light/adjd_s311.c
#1 lore raw
Quoted 9 lines · Jonathan Cameron

The following changes since commit c732a24c5a9392cf3738f5957e0d97d37c09e6e1:

staging:iio:adt7410: use local platformdata if none is specified
(2012-07-08 10:39:59 +0100)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git
tags/togreg-3.6a

Again linewrap :(

Anyway, how about making the tags, and the descriptions in the tag, a bit more IIO-specific? So that I, and others, know what the merge was?

Something like "iio-3.6a" is fine, no need to have my name in there if you don't want it. Remember, the tag name will live on in the merge message, which ends up in the changelog for forever :)

Oh, and pulled and pushed out.

thanks,

greg k-h