linux-next: manual merge of the trivial tree with the arm tree

[Stephen Rothwell]

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
arch/arm/mach-u300/include/mach/debug-macro.S between commit
7f62dc4756eaf761570b96250630d48f80397d64 ("ARM: 5910/1: ARM: Add tmp
register for addruart and loadsp") from the arm tree and commit
ba5584a307a1166597fbbe970ffdf49c8b7ee42a ("tree-wide: Assorted spelling
fixes") from the trivial tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/mach-u300/include/mach/debug-macro.S
index ca4a028,d591fe1..0000000
--- a/arch/arm/mach-u300/include/mach/debug-macro.S
+++ b/arch/arm/mach-u300/include/mach/debug-macro.S
@@@ -10,8 -10,8 +10,8 @@@
   */
  #include <mach/hardware.h>
  
 -	.macro	addruart,rx
 +	.macro	addruart, rx, tmp
- 	/* If we move the adress using MMU, use this. */
+ 	/* If we move the address using MMU, use this. */
  	mrc	p15, 0, \rx, c1, c0
  	tst	\rx, #1			@ MMU enabled?
  	ldreq	\rx,	  = U300_SLOW_PER_PHYS_BASE @ MMU off, physical address

Attachment: pgp00000.pgp
Description: PGP signature