Merge 3.6-rc3 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Aug 2012 14:10:40 +0000 (07:10 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Aug 2012 14:10:40 +0000 (07:10 -0700)
commit8f8b77bfdce811acbcf2248219a7aab5f92de938
treec76c736bdb931d5de55a0de20cd9822d7b48ce8b
parentd602a064f9818819d6c99d99f101bc6b1ae1540d
parentfea7a08acb13524b47711625eebea40a0ede69a0
Merge 3.6-rc3 into staging-next

This picks up fixes we want in this branch to allow us to properly test.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers.c
drivers/staging/iio/adc/ad7192.c