On ä, 2011-06-13 at 10:23 -0700, Paul E. McKenney wrote: > On Mon, Jun 13, 2011 at 01:28:18PM +0800, Wanlong Gao wrote: > > From: Wanlong Gao <wanlong.gao@xxxxxxxxx> > > > > Change all "arch/i386" to "arch/x86" in Documentaion/, > > since the directory has changed. > > > > Signed-off-by: Wanlong Gao <wanlong.gao@xxxxxxxxx> > > I have queued the Documentation/RCU/NMI-RCU.txt hunk with your > Signed-off-by, thank you! > > Thanx, Paul Hi Paul: http://git.kernel.org/?p=linux/kernel/git/jikos/trivial.git;a=commitdiff;h=25eb650a690b95cb0e2cf0c3b03f4900a59e0135 jiri had queued these all, will it get a merge failure? Thanks > > > --- > > Documentation/RCU/NMI-RCU.txt | 4 +- > > Documentation/blockdev/README.DAC960 | 2 +- > > Documentation/blockdev/ramdisk.txt | 8 +++--- > > Documentation/cpu-freq/cpu-drivers.txt | 2 +- > > Documentation/filesystems/nfs/nfsroot.txt | 2 +- > > Documentation/isdn/README.HiSax | 2 +- > > Documentation/kbuild/makefiles.txt | 38 ++++++++++++++-------------- > > Documentation/magic-number.txt | 2 +- > > Documentation/mca.txt | 6 ++-- > > Documentation/scheduler/sched-arch.txt | 2 +- > > Documentation/scsi/BusLogic.txt | 2 +- > > Documentation/serial/computone.txt | 2 +- > > Documentation/svga.txt | 2 +- > > Documentation/zh_CN/magic-number.txt | 2 +- > > 14 files changed, 38 insertions(+), 38 deletions(-) <snip patch> -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
