summaryrefslogtreecommitdiffstats
path: root/scripts/kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-06 10:41:07 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-06 10:41:07 +0100
commitc6f7afaeeda5b3c42ea8d7b27e197d223a04675e (patch)
tree9a86bc9593ef8219bfc469e277d1b327f38aed9e /scripts/kconfig
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
parentexofs: simple_write_end does not mark_inode_dirty (diff)
downloadlinux-c6f7afaeeda5b3c42ea8d7b27e197d223a04675e.tar.xz
linux-c6f7afaeeda5b3c42ea8d7b27e197d223a04675e.zip
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
* 'for-linus' of git://git.open-osd.org/linux-open-osd: exofs: simple_write_end does not mark_inode_dirty exofs: fix pnfs_osd re-definitions in pre-pnfs trees
Diffstat (limited to 'scripts/kconfig')
0 files changed, 0 insertions, 0 deletions