From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 26 Jan 2013 05:25:02 +0000 (-0800)
Subject: Merge 3.8-rc5 into staging-next
X-Git-Tag: v3.9-rc1~127^2~277
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f5f90a872c38b4e78f3cc95e8a25434b98e4db2;p=pandora-kernel.git

Merge 3.8-rc5 into staging-next

This resolves a merge issue with a iio driver, and the zram code.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

8f5f90a872c38b4e78f3cc95e8a25434b98e4db2
Reading git-diff-tree failed