diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-11 12:49:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-11 12:49:03 -0700 |
| commit | 9ddf7f5058c4f4badd38dba8d5896a5dbd7e716f (patch) | |
| tree | 14f3a30906900b54ab2fe17300b60e41863504d8 /drivers/media/video/v4l2-ioctl.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff) | |
| parent | PM: Reintroduce dropped call to check_wakeup_irqs (diff) | |
| download | linux-dev-9ddf7f5058c4f4badd38dba8d5896a5dbd7e716f.tar.xz linux-dev-9ddf7f5058c4f4badd38dba8d5896a5dbd7e716f.zip | |
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM: Reintroduce dropped call to check_wakeup_irqs
Diffstat (limited to 'drivers/media/video/v4l2-ioctl.c')
0 files changed, 0 insertions, 0 deletions