tree 76faabe589440d5509f56ef60d8b1dc9f45e1611
parent 7d34f46426c4f24a6c3356d5a938798a865ec9c6
parent 463bf9000750e08a85ee0b40da3266aae8a54ba2
author Linus Torvalds <torvalds@linux-foundation.org> 1259617522 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1259617522 -0800

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig:
  kconfig: Fix make O=<dir> local{mod,yes}config