Merge tag 'togreg-3.6a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 12 Jul 2012 19:29:44 +0000 (12:29 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 12 Jul 2012 19:29:44 +0000 (12:29 -0700)
IIO: One new driver and a couple of nice cleanups.

1  2 
drivers/iio/industrialio-buffer.c

Simple merge