Merge branch 'for-linus' of git://neil.brown.name/md
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Feb 2011 19:13:26 +0000 (11:13 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Feb 2011 19:13:26 +0000 (11:13 -0800)
* 'for-linus' of git://neil.brown.name/md:
  md: Fix - again - partition detection when array becomes active
  Fix over-zealous flush_disk when changing device size.
  md: avoid spinlock problem in blk_throtl_exit
  md: correctly handle probe of an 'mdp' device.
  md: don't set_capacity before array is active.
  md: Fix raid1->raid0 takeover

1  2 
fs/block_dev.c
fs/inode.c
include/linux/fs.h

diff --cc fs/block_dev.c
Simple merge
diff --cc fs/inode.c
Simple merge
Simple merge