From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Fri, 24 Sep 2010 17:16:33 +0000 (-0300)
Subject: Merge branch 'devel' into linux_next
X-Git-Tag: next-20110726~15^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bbab9984d7e65f08d3083814103b91b3dd382381;p=karo-tx-linux.git

Merge branch 'devel' into linux_next

* devel:
  i7300_edac: Properly initialize per-csrow memory size
  V4L/DVB: i7300_edac: better initialize page counts
---

bbab9984d7e65f08d3083814103b91b3dd382381