Merge tag 'fixes-togreg-3.6a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 12 Jul 2012 19:26:33 +0000 (12:26 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 12 Jul 2012 19:26:33 +0000 (12:26 -0700)
commitfc6ed2c6411e3ee0a3775d6d822f9b0169cc40a2
tree5f7900d05ce0c113641609d8a251ad3487b871a3
parentd99b5ac65e7827f10ba60b1ea44d7bd041d58d1d
parente59b9afecf7ddf52d31d24e800b473f19c23cfe0
Merge tag 'fixes-togreg-3.6a' of git://git./linux/kernel/git/jic23/iio into work-next

Various minor IIO fixes for staging-next.