| commit | e89c6fdf9e0eb1b5a03574d4ca73e83eae8deb91 | [log] [tgz] |
|---|---|---|
| author | NeilBrown <neilb@suse.com> | Sat Sep 05 11:07:04 2015 +0200 |
| committer | NeilBrown <neilb@suse.com> | Sat Sep 05 11:08:32 2015 +0200 |
| tree | f9df292ed03a5a3c4ddc658ae3646f02a1ffafce | |
| parent | c3cce6cda162eb2b2960a85d9c8992f4f3be85d0 [diff] | |
| parent | 1081230b748de8f03f37f80c53dfa89feda9b8de [diff] |
Merge linux-block/for-4.3/core into md/for-linux There were a few conflicts that are fairly easy to resolve. Signed-off-by: NeilBrown <neilb@suse.com>