Subject: linux-next: manual merge of the driver-core.current tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 20 Oct 2008 11:48:42 +1100

Hi Greg,

Today's linux-next merge of the driver-core.current tree got a conflict
in Documentation/sysctl/kernel.txt between commit
061b1bd394ca8628b7c24eb4658ba3535da4249a ("Staging: add TAINT_CRAP for
all drivers/staging code") from Linus' tree and commit
ac7b643ad9c570efa0b5cbc9af5581db8c2faf64 ("Document kernel taint flags
properly") from the driver-core.current tree.

So the Documentation patch in the former commit was not right (64 v 1024
for TAINT_CRAP) ...

I took the latter.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/