Merge commit 'v2.6.32' into reiserfs/kill-bkl
[sfrench/cifs-2.6.git] / drivers / sfi / Makefile
1 obj-y   += sfi_acpi.o
2 obj-y   += sfi_core.o
3