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)
commit5de4c51d2a859a1556b7d20ae1278c3e2d70a79b
treecc9cc1f5df8845471894010e625e130d111262a7
parent6594d0b1cdfd9058f5b766e490ea1c94ae5e0ed4
parente69cc9278831139660cb99bde52908f145338d77
Merge git://git./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