staging:iio:max1363 add new 2 channels parts form maxim, 11644-7

author Jonathan Cameron <jic23@cam.ac.uk>

Wed, 18 May 2011 13:42:10 +0000 (14:42 +0100)

committer Greg Kroah-Hartman <gregkh@suse.de>

Thu, 19 May 2011 23:14:59 +0000 (16:14 -0700)
author Jonathan Cameron <jic23@cam.ac.uk>
Wed, 18 May 2011 13:42:10 +0000 (14:42 +0100)
committer Greg Kroah-Hartman <gregkh@suse.de>
Thu, 19 May 2011 23:14:59 +0000 (16:14 -0700)
diff --cc drivers/staging/iio/adc/Kconfig
Simple merge
diff --cc drivers/staging/iio/adc/max1363_core.c
Simple merge
author	Jonathan Cameron <jic23@cam.ac.uk>
	Wed, 18 May 2011 13:42:10 +0000 (14:42 +0100)
committer	Greg Kroah-Hartman <gregkh@suse.de>
	Thu, 19 May 2011 23:14:59 +0000 (16:14 -0700)
drivers/staging/iio/adc/Kconfig		patch \| blob \| history
drivers/staging/iio/adc/max1363_core.c		patch \| blob \| history