| commit | 8022c0bd3f0fd83d35ff1b7c4c5ca2fa19a63c3b | [log] [tgz] |
|---|---|---|
| author | Michael Ellerman <mpe@ellerman.id.au> | Fri Jun 05 20:46:23 2015 +1000 |
| committer | Michael Ellerman <mpe@ellerman.id.au> | Fri Jun 05 20:46:26 2015 +1000 |
| tree | 522521f7b82758e7443f4444ee627b61147d52f8 | |
| parent | 5cdc7fc4d89b0e1640eaf00321744fd74c444fc6 [diff] | |
| parent | 084861124d00b046cb4159b0158e1b74626b8257 [diff] |
Merge remote-tracking branch 'staging/staging-next' Conflicts: drivers/staging/media/dt3155v4l/dt3155v4l.c