tree 5841151d3345286986c675f1b8b3e6fa6efd2bc4
parent b17b3d479c4c43c3a980ee553c3be3ca456523de
parent 48a61569bb5396415c5dad0e81e1cfeb87c0aca3
author Linus Torvalds <torvalds@linux-foundation.org> 1217616621 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1217616621 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
  kbuild: scripts/ver_linux: don't set PATH
  Kconfig/init: change help text to match default value
  kbuild: genksyms: Include extern information in dumps
  kbuild: genksyms parser: fix the __attribute__ rule
  kbuild: scripts/genksyms/lex.l: add %option noinput
  kconfig: scripts/kconfig/zconf.l: add %option noinput
  kbuild: fix O=... build of um