Merge tag 'md/3.19-fixes' of git://neil.brown.name/md
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Feb 2015 03:54:57 +0000 (19:54 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Feb 2015 03:54:57 +0000 (19:54 -0800)
Pull two fixes for md from Neil Brown:

 - Another live lock, needs backporting

 - work-around false positive with new warnings.

* tag 'md/3.19-fixes' of git://neil.brown.name/md:
  md/bitmap: fix a might_sleep() warning.
  md/raid5: fix another livelock caused by non-aligned writes.


Trivial merge