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-Tag: firefly_0821_release~32405 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fefd26b3b8597a11a422d950c0d4424ff33a70ad;p=firefly-linux-kernel-4.4.55.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