]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'devel' into linux_next
authorMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 24 Sep 2010 17:16:33 +0000 (14:16 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 24 Sep 2010 17:16:33 +0000 (14:16 -0300)
* devel:
  i7300_edac: Properly initialize per-csrow memory size
  V4L/DVB: i7300_edac: better initialize page counts


Trivial merge