diff options
author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-13 11:09:25 +0200 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-13 11:09:25 +0200 |
commit | f0d4a871fa84d094bcb337b16ce7bc4c17bc750a (patch) | |
tree | dcb1904c9eb65aebd9fe8807ec13c62833073ea3 /tools | |
parent | 5c719ae196db83efbb08d9abcb953a7729745ce2 (diff) | |
parent | 648ec275cc53a16f7ae503314bfd4fd9bd525dd0 (diff) |
Merge remote-tracking branch 'armlt/previous-armlt-gator' into stable-ubuntu-ux500-3.3-1
Conflicts:
drivers/Kconfig
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions