From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Mon, 25 Jun 2012 11:51:08 +0000 (-0300)
Subject: Merge /home/v4l/v4l/for_upstream
X-Git-Tag: next-20120724~79^2~11
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dea20861747304bce4272f18cef5b908fd14a464;p=karo-tx-linux.git

Merge /home/v4l/v4l/for_upstream

* /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()
---

dea20861747304bce4272f18cef5b908fd14a464