Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
[safe/jmp/linux-2.6] / include / linux / vga_switcheroo.h
2010-03-01 Dave Airlievga_switcheroo: fix build on platforms with no ACPI
2010-03-01 Dave Airlievga_switcheroo: initial implementation (v15)