summaryrefslogtreecommitdiff
path: root/drivers/memory
diff options
context:
space:
mode:
authorNicolas Ferre <nicolas.ferre@atmel.com>2014-08-25 17:33:23 +0400
committerNicolas Ferre <nicolas.ferre@atmel.com>2014-08-25 17:33:23 +0400
commit39333610ba3b1e076ac1ceccca34de037a413a03 (patch)
treea65c958206f5bcdebea561660c8d4733d5010309 /drivers/memory
parent7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 (diff)
parent2626063f86cdce500153e8550334b9331421dc6f (diff)
parent464d6e18639c4347dafd8dbcee270674dd3d8fba (diff)
downloadlinux-39333610ba3b1e076ac1ceccca34de037a413a03.tar.xz
Merge branches 'at91-3.18-cleanup' and 'at91-3.18-dt' into at91-3.18-drivers