]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commitbbab9984d7e65f08d3083814103b91b3dd382381
tree9452d7276bea141be197a2559db919dd9a460ed8
parent6531d0835b26f39a32aad0109107c20ac8058f5d
parente6649cc62949f1ed473bf1131fa425cfe72d3f64
Merge branch 'devel' into linux_next

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