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

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

b600c5b569c2f62eacf8d71dd9975d7a996073f3