linux-next: manual merge of the x86 tree

From: Stephen Rothwell <hidden>
Date: 2008-08-15 03:58:18 

Hi all,

Today's linux-next merge of the x86 tree got a trivial conflict in
include/asm-x86/pda.h between commit
af9ff7868f0f76d3364351b1641b9dfa99588e77 ("x86: simplify stackprotector
self-check") from the stackprotector tree and commit
77ef50a522717fa040636ee1017179ceba12ff62 ("x86: consolidate header
guards") from the x86 tree.

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

Attachments

  • (unnamed) [application/pgp-signature] 197 bytes
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help