| commit | 877c2196bf43e410b8b1a66c7bbf7d5cb98a9f41 | [log] [tgz] |
|---|---|---|
| author | Alex Shi <alex.shi@linaro.org> | Mon Mar 30 11:22:08 2015 +0800 |
| committer | Alex Shi <alex.shi@linaro.org> | Mon Mar 30 11:22:08 2015 +0800 |
| tree | f74b6a59cd223c470830b3e4f3e1b6a4270abc1a | |
| parent | b95b6a6ddfae1513893676e444f585a106513688 [diff] | |
| parent | 2dad587ec1dddf02a00d3b54156337a6dc79a752 [diff] |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android Conflicts: net/netfilter/xt_socket.c