From: Mauro Carvalho Chehab Date: Wed, 22 Sep 2010 12:37:52 +0000 (-0300) Subject: Merge branch 'devel' into linux_next X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6531d0835b26f39a32aad0109107c20ac8058f5d;p=pandora-kernel.git Merge branch 'devel' into linux_next * devel: (23 commits) MAINTAINERS: Add maintainer for i7300-edac driver i7300-edac: CodingStyle cleanup i7300_edac: Improve comments i7300_edac: Cleanup: reorganize the file contents i7300_edac: Properly detect channel on CE errors i7300_edac: enrich FBD error info for corrected errors i7300_edac: enrich FBD error info for fatal errors i7300_edac: pre-allocate a buffer used to prepare err messages i7300_edac: Fix MTR x4/x8 detection logic i7300_edac: Make the debug messages coherent with the others i7300_edac: Cleanup: remove get_error_info logic i7300_edac: Add a code to cleanup error registers i7300_edac: Add support for reporting FBD errors i7300_edac: Properly detect the type of error correction i7300_edac: Detect if the device is on single mode i7300_edac: Adds detection for enhanced scrub mode on x8 i7300_edac: Clear the error bit after reading i7300_edac: Add error detection code for global errors i7300_edac: Better name PCI devices i7300_edac: Add a FIXME note about the error correction type ... --- 6531d0835b26f39a32aad0109107c20ac8058f5d Reading git-diff-tree failed