From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 6 Jul 2012 23:03:44 +0000 (-0700)
Subject: Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio... 
X-Git-Tag: v3.6-rc1~100^2~416
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c01ef023ec1d2af185e55f7600405dcce1813d5d;p=users%2Fhch%2Fblock.git

Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
---

c01ef023ec1d2af185e55f7600405dcce1813d5d