diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2012-07-05 16:58:54 +0200 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-07-05 16:58:54 +0200 |
commit | 5e67cc4041304a0dc77e6cfbb355d69eefb883d0 (patch) | |
tree | 4eb04d0a2890f2e0a182e762071fea4ffb5abe5d /drivers/ata | |
parent | 6887a4131da3adaab011613776d865f4bcfb5678 (diff) | |
parent | 96b70641b937e99c1579cb6ebbcdb7b0af98cdd0 (diff) | |
download | blackbird-op-linux-5e67cc4041304a0dc77e6cfbb355d69eefb883d0.tar.gz blackbird-op-linux-5e67cc4041304a0dc77e6cfbb355d69eefb883d0.zip |
Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6 into grant
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/ata')
0 files changed, 0 insertions, 0 deletions