tree a52ec0e214ce7ecd1295c1dbeb6ab2343371885f
parent 4d3797d7e1861ac1af150a6189315786c5e1c820
parent 42a0940d9d582214a8d0f8ba41f2b4fe987e21b0
author Linus Torvalds <torvalds@linux-foundation.org> 1370480745 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> 1370480745 +0900

Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Pull kbuild fixes from Michal Marek:
 "There is one fix for a kbuild regression, plus three kconfig fixes for
  bugs that have alway been there, but are simple enough to be fixed in
  an -rc"

* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kconfig/menu.c: fix multiple references to expressions in menu_add_prop()
  mconf: handle keys in empty dialogs
  kbuild: Don't assume dts files live in arch/*/boot/dts
  scripts/config: fix assignment of parameters for short version of --*-after options