diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-17 12:48:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-17 12:48:18 -0700 |
| commit | 54a772b8aace3df8ad6af0bd0748f57d27f72b1d (patch) | |
| tree | bb75460187efc5b699491da9cd7fa423e8de7b4b /fs/nilfs2/inode.c | |
| parent | a6b52a9db891e2a39e8a0fed6005935d8b1aa59c (diff) | |
| parent | a1ad5ec7f520c559becab2e989a397f1d6ac5eb0 (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] tuner-core: fix a 2.6.39 regression with mt20xx
[media] dvb_frontend: fix race condition in stopping/starting frontend
[media] media: fix radio-sf16fmr2 build when SND is not enabled
[media] MEDIA: Fix non-ISA_DMA_API link failure of sound code
[media] nuvoton-cir: make idle timeout more sane
[media] mceusb: increase default timeout to 100ms
[media] mceusb: Timeout unit corrections
[media] Revert "V4L/DVB: cx23885: Enable Message Signaled Interrupts(MSI)"
Diffstat (limited to 'fs/nilfs2/inode.c')
0 files changed, 0 insertions, 0 deletions