| commit | 7ca363f6872bede71e486352885de3a88f4a3967 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Sat Feb 08 13:38:28 2014 -0800 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Sat Feb 08 13:38:28 2014 -0800 |
| tree | 75d334cd41bfdd5c9c6c49cb58c1301adfbe3903 | |
| parent | e4b41af14d7dc683ecd84a10fed8ea38b94f0f28 [diff] | |
| parent | a0f452520211385522aad5bd12d90aa59f17e094 [diff] |
Merge branch 'staging-linus' into staging-work This is to pull in the lustre fixes so that others can continue to work on updating the lustre codebase, as well as resolve some merge issues with the ion and ocproto drivers to keep linux-next happy. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>