Merge git://git.infradead.org/~dwmw2/random-2.6

* git://git.infradead.org/~dwmw2/random-2.6:
  remove dummy asm/kvm.h files
  firmware: create firmware binaries during 'make modules'.

diff --combined include/asm-x86/Kbuild
index 00473f7,811e982..4a8e80c
--- 1/include/asm-x86/Kbuild
--- 2/include/asm-x86/Kbuild
+++ b/include/asm-x86/Kbuild
@@@ -3,7 -3,6 +3,6 @@@ include include/asm-generic/Kbuild.as
  header-y += boot.h
  header-y += bootparam.h
  header-y += debugreg.h
- header-y += kvm.h
  header-y += ldt.h
  header-y += msr-index.h
  header-y += prctl.h
@@@ -19,6 -18,7 +18,6 @@@ unifdef-y += msr.
  unifdef-y += mtrr.h
  unifdef-y += posix_types_32.h
  unifdef-y += posix_types_64.h
 -unifdef-y += ptrace.h
  unifdef-y += unistd_32.h
  unifdef-y += unistd_64.h
  unifdef-y += vm86.h

diff --combined include/linux/Kbuild
index a18008c,402c8f5..4c4142c
--- 1/include/linux/Kbuild
--- 2/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@@ -189,6 -189,7 +189,6 @@@ unifdef-y += connector.
  unifdef-y += cuda.h
  unifdef-y += cyclades.h
  unifdef-y += dccp.h
 -unifdef-y += dirent.h
  unifdef-y += dlm.h
  unifdef-y += dlm_plock.h
  unifdef-y += edd.h
@@@ -255,7 -256,9 +255,9 @@@ unifdef-y += kd.
  unifdef-y += kernelcapi.h
  unifdef-y += kernel.h
  unifdef-y += keyboard.h
+ ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
  unifdef-y += kvm.h
+ endif
  unifdef-y += llc.h
  unifdef-y += loop.h
  unifdef-y += lp.h