Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-frv
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Apr 2009 14:47:13 +0000 (07:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Apr 2009 14:47:13 +0000 (07:47 -0700)
* 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


Trivial merge