diff options
| author | Josh Wu <josh.wu@atmel.com> | 2012-10-22 15:49:04 +0800 |
|---|---|---|
| committer | Josh Wu <josh.wu@atmel.com> | 2012-10-22 15:49:04 +0800 |
| commit | d09dc68d74844b44b89a1311f60055351952fb0e (patch) | |
| tree | 6d4bf5d6962bfa3c5d4597d8fbcdb7e2fd840266 /drivers/spi | |
| parent | 6528ff0109d81c1f21d20f9f1370782bccf87bcb (diff) | |
| parent | 3cda03c7fa4413eef2ee250b5936a88c25dbc1be (diff) | |
Merge branch 'josh/sama5ek/v2012.10-rc1' into josh/sama5ek/v2012.10
Conflicts:
drivers/mtd/spi/atmel.c
Diffstat (limited to 'drivers/spi')
0 files changed, 0 insertions, 0 deletions