[Forgot the cc]
Begin forwarded message:
Date: Wed, 25 Mar 2009 15:08:17 +1100
From: Stephen Rothwell s...@canb.auug.org.au
To: Rusty Russell ru...@rustcorp.com.au
Cc: linux-n...@vger.kernel.org
Subject: linux-next: manual merge of the rr tree with the powerpc tree
Hi Rusty,
Today's linux
Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
arch/powerpc/kernel/sysfs.c between commit
93197a36a9c16a85fb24cf5a8639f7bf9af838a3 (powerpc: Rewrite sysfs
processor cache info code) from Linus' tree and commit
013ab448cec493262080ecc47b13e0adbcfaeccd
