From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 18 Jan 2011 18:00:50 +0000 (-0800)
Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6
X-Git-Tag: v2.6.38-rc1~5
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=aa891f6b3f440402c6879ad1ecf332d318137422;p=~shefty%2Frdma-dev.git

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
  parisc: fix compile breakage caused by inlining maybe_mkwrite
  parisc : Remove broken line wrapping handling pdc_iodc_print()
---

aa891f6b3f440402c6879ad1ecf332d318137422