aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/Makefile-i386
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-06 07:53:46 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-06 07:53:46 -0800
commit65d3a68af53523d4d6daeb896c93e326cf46fd85 (patch)
treeb15931691edab2fb4e5465c3c14a4f159c8f25e4 /arch/um/Makefile-i386
parentMerge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6 (diff)
parent9p: add missing end-of-options record for trans_fd (diff)
downloadlinux-dev-65d3a68af53523d4d6daeb896c93e326cf46fd85.tar.xz
linux-dev-65d3a68af53523d4d6daeb896c93e326cf46fd85.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: 9p: add missing end-of-options record for trans_fd 9p: return NULL when trans not found 9p: use copy of the options value instead of original 9p: fix memory leak in v9fs_get_sb
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions