From: Linus Torvalds Date: Wed, 4 Oct 2006 16:59:57 +0000 (-0700) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fefd26b3b8597a11a422d950c0d4424ff33a70ad;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge /pub/scm/linux/kernel/git/davej/configh * master.kernel.org:/pub/scm/linux/kernel/git/davej/configh: Remove all inclusions of Manually resolved trivial path conflicts due to removed files in the sound/oss/ subdirectory. --- fefd26b3b8597a11a422d950c0d4424ff33a70ad