Merge commit 'v2.6.29-rc1' into timers/hrtimers
[linux-2.6] / drivers / staging / asus_oled / Makefile
1 obj-$(CONFIG_ASUS_OLED)         += asus_oled.o