]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge /home/v4l/v4l/for_upstream
authorMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 25 Jun 2012 11:51:08 +0000 (08:51 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 25 Jun 2012 11:51:08 +0000 (08:51 -0300)
* /home/v4l/v4l/for_upstream:
  [media] media: pms.c needs linux/slab.h
  [media] smiapp-core: fix compilation build error
  [media] pms: fix build error in pms_probe()


Trivial merge