Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Jan 2011 18:00:50 +0000 (10:00 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Jan 2011 18:00:50 +0000 (10:00 -0800)
commitaa891f6b3f440402c6879ad1ecf332d318137422
tree35b1997a00ecf137e22713de8a25ad011d07b6d9
parenta25cecce88194b2edf38b8c3b1665e9318eb2d22
parent84cd8453f30787504305a1a1f8dd5af7a92aa485
Merge branch 'fixes' of git://git./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()