956 parent ed37d83e6aa218192fb28bb6b82498d2a8c74070 author Linus Torvalds 1243444706 -0700 committer Linus Torvalds 1243444706 -0700 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' }׎Ւ