| commit | 8f5f90a872c38b4e78f3cc95e8a25434b98e4db2 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Fri Jan 25 21:25:02 2013 -0800 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Fri Jan 25 21:25:02 2013 -0800 |
| tree | 36c50b0c97286ab89c85016f7ab281f8e843c05c | |
| parent | c0cd2da16b431a2007ea83865f3dd1530c1643a5 [diff] | |
| parent | 949db153b6466c6f7cad5a427ecea94985927311 [diff] |
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>