Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-frv

* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-frv:
  FRV: Move to arch/frv/include/asm/
  FRV: Fix indentation errors to keep git-am happy when moving arch header files

include/asm-frv/thread_info.h → arch/frv/include/asm/thread_info.h

@@ -38,8 +38,8 @@ struct thread_info {
 	int			preempt_count;	/* 0 => preemptable, <0 => BUG */
 
 	mm_segment_t		addr_limit;	/* thread address space:
-					 	   0-0xBFFFFFFF for user-thead
-						   0-0xFFFFFFFF for kernel-thread
+						 * 0-0xBFFFFFFF for user-thead
+						 * 0-0xFFFFFFFF for kernel-thread
 						 */
 	struct restart_block    restart_block;