diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-04 17:33:53 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-04 17:33:53 +0200 |
| commit | 3e858759f72931683cb4a938871bac7a87d0de56 (patch) | |
| tree | cef9658bee8668c814fcdd8ebf3e0551bab7229f /drivers/media/radio/radio-typhoon.c | |
| parent | Merge branch 'unicore32' of git://git.kernel.org/pub/scm/linux/kernel/git/epi... (diff) | |
| parent | [media] radio: wl128x: Update registration process with ST (diff) | |
| download | linux-3e858759f72931683cb4a938871bac7a87d0de56.tar.xz linux-3e858759f72931683cb4a938871bac7a87d0de56.zip | |
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
Diffstat (limited to 'drivers/media/radio/radio-typhoon.c')
0 files changed, 0 insertions, 0 deletions