From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 4 Apr 2011 15:33:53 +0000 (-0700)
Subject: Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: Ubuntu-5.0.0-8.9~19338
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3e858759f72931683cb4a938871bac7a87d0de56;p=mirror_ubuntu-disco-kernel.git

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
  [media] radio: wl128x: Update registration process with ST
  [media] staging: altera-jtag needs delay.h
---

3e858759f72931683cb4a938871bac7a87d0de56