diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 08:31:39 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 08:31:39 +0200 |
| commit | 193a6dec1c0246a80b6d0101e4f351ccf877bcac (patch) | |
| tree | 2f0f0ff70241ae8c9dc0c07c3369c0bf96956b14 /include/asm-generic/ioctl.h | |
| parent | ACPI: don't pass handle for fixed hardware notifications (diff) | |
| parent | ACPI video: work-around BIOS AML bug in _BQC (diff) | |
| download | linux-193a6dec1c0246a80b6d0101e4f351ccf877bcac.tar.xz linux-193a6dec1c0246a80b6d0101e4f351ccf877bcac.zip | |
Merge branch 'video' into release
Conflicts:
drivers/acpi/video.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/asm-generic/ioctl.h')
0 files changed, 0 insertions, 0 deletions