Merge branch 'foreign/anand/dev-del-by-id-ext' into for-chris-4.7-20160516
authorDavid Sterba <dsterba@suse.com>
Mon, 16 May 2016 13:46:26 +0000 (15:46 +0200)
committerDavid Sterba <dsterba@suse.com>
Mon, 16 May 2016 13:46:26 +0000 (15:46 +0200)
commit36fac9e9ff20f71fe7ba21978f5949a38d390a4b
tree10082ddf221595755b136701fda9c26308f277d3
parent5ef64a3e757c94b2f2fc61465ef9603aaacaecff
parent88acff64c621aaeee2a4fe0ed124c77358069bce
Merge branch 'foreign/anand/dev-del-by-id-ext' into for-chris-4.7-20160516
fs/btrfs/ioctl.c
fs/btrfs/volumes.c
fs/btrfs/volumes.h