www.infradead.org Git - users/hch/uuid.git/commit

author	Linus Torvalds <torvalds@linux-foundation.org>
	Mon, 6 Dec 2010 00:41:13 +0000 (16:41 -0800)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Mon, 6 Dec 2010 00:41:13 +0000 (16:41 -0800)
commit	31c67c755363c7e7821221e72f8594ab8995764d
tree	a55fea1c515e4738b426af02da02598371ac8bb8	tree
parent	47ad504c56235c7c7c0020e631651420a55c74e7	commit \| diff
parent	307991055b0ce65d53dc1eb501c456c10eb36360	commit \| diff

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

* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  initramfs: Really fix build break on symbol-prefixed archs
  [media] Fix Kconfig errors due to two visible menus
  i2c/algos: convert Kconfig to use the menu's `visible' keyword
  media/video: convert Kconfig to use the menu's `visible' keyword
  Revert "i2c: Fix Kconfig dependencies"
  kconfig: regen parser
  kconfig: add an option to determine a menu's visibility