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

This commit is contained in:
Greg Kroah-Hartman 2012-07-06 16:01:20 -07:00
commit b600c5b569
4 changed files with 28 additions and 11 deletions