summaryrefslogtreecommitdiff
path: root/fs/ocfs2/super.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-12-06 03:41:13 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-06 03:41:13 +0300
commit31c67c755363c7e7821221e72f8594ab8995764d (patch)
treea55fea1c515e4738b426af02da02598371ac8bb8 /fs/ocfs2/super.c
parent47ad504c56235c7c7c0020e631651420a55c74e7 (diff)
parent307991055b0ce65d53dc1eb501c456c10eb36360 (diff)
downloadlinux-31c67c755363c7e7821221e72f8594ab8995764d.tar.xz
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
Diffstat (limited to 'fs/ocfs2/super.c')
0 files changed, 0 insertions, 0 deletions