From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 10 Apr 2009 14:47:13 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-frv
X-Git-Tag: v2.6.30-rc2~90
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5de4c51d2a859a1556b7d20ae1278c3e2d70a79b;p=~emulex%2Finfiniband.git

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
---

5de4c51d2a859a1556b7d20ae1278c3e2d70a79b