diff options
| author | Ian Pozella <ian.pozella@imgtec.com> | 2015-06-30 16:51:44 +0100 |
|---|---|---|
| committer | Ian Pozella <ian.pozella@imgtec.com> | 2015-06-30 16:51:44 +0100 |
| commit | cd4f0c0c1138532d9467f9e8a5c23e5c9d3aa7e0 (patch) | |
| tree | af7448e5e94eb681f4e9f6cbcc6ee862b79514c7 /.gitreview | |
| parent | 8a68bfb2793bc0fc72bdb4ea8239c6b628327b5e (diff) | |
| parent | 1b52c5584ac046d4044da91e25c20cc161d8c447 (diff) | |
| download | v4.1-cd4f0c0c1138532d9467f9e8a5c23e5c9d3aa7e0.tar.gz | |
Merge branch '4.1-imgworks' into 4.1-imgsystems
Conflicts:
.gitreview
Change-Id: Ib0d1f4a9327317a4126fd71c125c3988c2ff0253
Diffstat (limited to '.gitreview')
| -rw-r--r-- | .gitreview | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.gitreview b/.gitreview index d195cc2937e..0c9183cec91 100644 --- a/.gitreview +++ b/.gitreview @@ -1,9 +1,8 @@ [gerrit] host=imgworks.imgtec.com port=29418 -project=linux_kernel +project=systems/linux defaultremote=imgsystems defaultbranch=4.1-imgsystems defaultrebase=0 defaultdraft=1 - |