diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-12 20:08:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-12 20:08:47 -0700 |
| commit | 88bbfb4a6267ff90a466ade9762d9a8fff2bb1bb (patch) | |
| tree | 5d7693dd6e3fe81bb72ec3d83e9f9a8bb9aac649 /drivers/thermal/armada_thermal.c | |
| parent | 71998d1be4ae70e7d320cdd21595c1a02a29c61e (diff) | |
| parent | 51fdc6bf98802eb7019ec94dfd82f0e6cd1c82a8 (diff) | |
Merge tag 'blackfin-for-linus' of http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux
Pull blackfin updates from Steven Miao.
* tag 'blackfin-for-linus' of http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
blackfin: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
Revert "blackfin: dma: current count mmr is read only"
bf533: fix build error: add linux/gpio.h
Diffstat (limited to 'drivers/thermal/armada_thermal.c')
0 files changed, 0 insertions, 0 deletions