diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-04 08:33:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-04 08:33:53 -0700 |
| commit | 3e858759f72931683cb4a938871bac7a87d0de56 (patch) | |
| tree | cef9658bee8668c814fcdd8ebf3e0551bab7229f /Makefile | |
| parent | 3230ca9dc656a2354b679e2e62ee7740485563a9 (diff) | |
| parent | 6705a9cc52733cb5cbdbee72be66ab462d8fb46f (diff) | |
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 'Makefile')
0 files changed, 0 insertions, 0 deletions