Merge branch 'for-linus' of git://neil.brown.name/md
commit54726f14b53cae061c504ac572320a16a5616de5
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 May 2009 17:18:26 +0000 (27 10:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 May 2009 17:18:26 +0000 (27 10:18 -0700)
treeb7ab3b1dd5d938f395a82ca25b84f4a0dc6c8f0d
parent8784cdd9af0e3b6a8a42b538db51d7f1951be956
parented37d83e6aa218192fb28bb6b82498d2a8c74070
Merge branch 'for-linus' of git://neil.brown.name/md

* 'for-linus' of git://neil.brown.name/md:
  md: raid5: change incorrect usage of 'min' macro to 'min_t'