Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Apr 2011 15:33:53 +0000 (08:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Apr 2011 15:33:53 +0000 (08:33 -0700)
commit3e858759f72931683cb4a938871bac7a87d0de56
treecef9658bee8668c814fcdd8ebf3e0551bab7229f
parent3230ca9dc656a2354b679e2e62ee7740485563a9
parent6705a9cc52733cb5cbdbee72be66ab462d8fb46f
Merge branch 'v4l_for_linus' of git://git./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