diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-11 16:46:46 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-11 16:46:46 -0500 |
| commit | d0c4c9d4a2e46f052178806c4004d52cd3ae040f (patch) | |
| tree | 648f09c93d8aab711ba9aa9f3cb424462a5b6222 /drivers/acpi/sleep/proc.c | |
| parent | 460c54b779fce3490ab70a84fd2ef59250ca3d57 (diff) | |
| parent | da517164f5b9133ecc7a020342e90452c215ec0f (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
V4L/DVB (7001): av7110: fix section mismatch
V4L/DVB (6999): ivtv: stick to udelay=10 after all
Diffstat (limited to 'drivers/acpi/sleep/proc.c')
0 files changed, 0 insertions, 0 deletions