Merge branch 'linus' into tracing/core
[linux-2.6] / drivers / idle / Makefile
1 obj-$(CONFIG_I7300_IDLE)                        += i7300_idle.o
2