From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 6 Dec 2010 00:41:13 +0000 (-0800)
Subject: Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuil... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=31c67c755363c7e7821221e72f8594ab8995764d;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'rc-fixes' of git://git./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
---

31c67c755363c7e7821221e72f8594ab8995764d