| commit | 00fda1682efdbd62a20a8a21aee52d994c323c7f | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Jun 08 10:49:28 2015 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Jun 08 10:49:28 2015 -0700 |
| tree | f49cee6c892019f193bf29985604951dd81ea94d | |
| parent | 1c4b1d73bacc546ba4e42f7eb4cb88c54139820b [diff] | |
| parent | d4a4f75cd8f29cd9464a5a32e9224a91571d6649 [diff] |
Merge 4.1-rc7 into tty-next This fixes up a merge issue with the amba-pl011.c driver, and we want the fixes in this branch as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>