Merge branch 'for-linus-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

* 'for-linus-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig:
  kconfig: simplification of scripts/extract-ikconfig

diff --combined Documentation/dontdiff
index 3ad6acead94950a3b83e4f14912e01cc64973b6b,bc01a5a9d6634bdf5b6d437c404e33c55d46eedd..d9bcffd594331d7b52a5608269327a7c6642af31
--- 1/Documentation/dontdiff
--- 2/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@@ -65,11 -65,9 +65,10 @@@ aicdb.h
  asm-offsets.h
  asm_offsets.h
  autoconf.h*
 +av_permissions.h
  bbootsect
  bin2c
  binkernel.spec
- binoffset
  bootsect
  bounds.h
  bsetup
@@@ -96,15 -94,12 +95,15 @@@ docpro
  elf2ecoff
  elfconfig.h*
  fixdep
 +flask.h
  fore200e_mkfirm
  fore200e_pca_fw.c*
  gconf
  gen-devlist
  gen_crc32table
  gen_init_cpio
 +generated
 +genheaders
  genksyms
  *_gray256.c
  ihex2fw