Hi Greg,

Today's linux-next import of the driver-core.current tree got a conflict
in document-kernel-taint-flags-properly.patch.  It would not apply until
I removed the line

- 64 - A module from drivers/staging was loaded.

from the context.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/