Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
[safe/jmp/linux-2.6] / drivers / gpu / vga / vga_switcheroo.c
2010-03-01 Dave Airlievga_switcheroo: fix build on platforms with no ACPI
2010-03-01 Dave Airlievga_switcheroo: initial implementation (v15)