Merge branch 'for-linus-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Feb 2010 22:43:57 +0000 (14:43 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Feb 2010 22:43:57 +0000 (14:43 -0800)
commit1954ee55605a75c91924b63c2584f4d53f11afc7
tree09adc8376a2b1ba190202a8908285ef3373ae28f
parenta85821fce2c100a6680511f9693b76f9717fbdee
parent7b76bfc86757ca5e7b0a62f50003752da77c115b
Merge branch 'for-linus-1' of git://git./linux/kernel/git/rostedt/linux-2.6-kconfig

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