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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 11 Jul 2008 11:48:17 +1000

Hi all,

Today's linux-next merge of the x86 tree got conflicts in
arch/x86/kernel/traps_32.c and arch/x86/kernel/traps_64.c between commit
db47946e32824309a7815eddb78e838a5c276fb1 ("sysfs: crash debugging") from
the driver-core tree and commits e423f49fc8ccd761618748d7139638d8ddc1d16f
("x86: traps_xx: modify __die"), badc76527f7e29302f0bde3d366c59101fb2ab87
("x86: traps_xx: shuffle headers and globals") and
a8c1be9d2e78d8608892c86791837acf12da4bf6 ("x86: initial changes to unify
traps_32.c and traps_64.c") from the x86 tree.

I just applied the driver-core addition (one line in each case) to the
x86 tree versions.

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