Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

diff --combined include/linux/Kbuild
index 10d2ca07562a0e07f27c71ca81e37f088bd2fec9,67383605f2e57df2ce771398fa102c518c224e46..19a3664f1dfe9f9155869b48cced25b0b098babc
--- 1/include/linux/Kbuild
--- 2/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@@ -12,7 -12,6 +12,6 @@@ header-y += netfilter_bridge
  header-y += netfilter_ipv4/
  header-y += netfilter_ipv6/
  
- header-y += affs_fs.h
  header-y += affs_hardblocks.h
  header-y += aio_abi.h
  header-y += a.out.h
@@@ -67,7 -66,6 +66,6 @@@ header-y += genetlink.
  header-y += gen_stats.h
  header-y += gigaset_dev.h
  header-y += hdsmart.h
- header-y += hpfs_fs.h
  header-y += hysdn_if.h
  header-y += i2c-dev.h
  header-y += i8k.h
@@@ -103,6 -101,7 +101,7 @@@ header-y += ixjuser.
  header-y += jffs2.h
  header-y += keyctl.h
  header-y += limits.h
+ header-y += magic.h
  header-y += major.h
  header-y += matroxfb.h
  header-y += meye.h
@@@ -116,7 -115,6 +115,6 @@@ header-y += netrom.
  header-y += nfs2.h
  header-y += nfs4_mount.h
  header-y += nfs_mount.h
- header-y += openprom_fs.h
  header-y += param.h
  header-y += pci_ids.h
  header-y += pci_regs.h
@@@ -143,6 -141,7 +141,6 @@@ header-y += snmp.
  header-y += sockios.h
  header-y += som.h
  header-y += sound.h
 -header-y += stddef.h
  header-y += synclink.h
  header-y += telephony.h
  header-y += termios.h
@@@ -317,7 -316,6 +315,7 @@@ unifdef-y += sonet.
  unifdef-y += sonypi.h
  unifdef-y += soundcard.h
  unifdef-y += stat.h
 +unifdef-y += stddef.h
  unifdef-y += sysctl.h
  unifdef-y += tcp.h
  unifdef-y += time.h