Subject: linux-next: manual merge of the crypto tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 7 Aug 2008 13:35:25 +1000

Hi Herbert,

Today's linux-next merge of the crypto tree got a conflict in
include/asm-x86/cpufeature.h between commit
32e1d0a0651004f5fe47f85a2a5c725ad579a90c ("x64, x2apic/intr-remap: cpuid
bits for x2apic feature") from the x86 tree and commit
1f4f8a5d7935c81b5b3c7601ec9ac021db30ba4f ("crypto: crc32c - Use Intel
CRC32 instruction") from the crypto tree.

Just simple overlapping additions.  I added both of them and can carry
the fixup.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/