Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Nov 2009 21:45:22 +0000 (13:45 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Nov 2009 21:45:22 +0000 (13:45 -0800)
commit9f1680794f83ee5497d5ef40c982b4da30c587cf
tree76faabe589440d5509f56ef60d8b1dc9f45e1611
parent7d34f46426c4f24a6c3356d5a938798a865ec9c6
parent463bf9000750e08a85ee0b40da3266aae8a54ba2
Merge branch 'for-linus' of git://git./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