linux-next: powerpc tree merge conflict

[Stephen Rothwell]

Hi Paul,

There was a small conflict with Linus' tree (in arch/powerpc/Kconfig) in
merging the powerpc next branch into today's linux-next tree.  Commit
d9b2b2a277219d4812311d995054ce4f95067725 ('[LIB]: Make PowerPC LMB code
generic so sparc64 can use it too') conflicted with
9edddaa200df18e08fe0cf21036e8ae467b1363c ('Kprobes: indicate kretprobe
support in Kconfig'). I fixed it up.

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20080305/4832f069/attachment.pgp>