diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 12:52:05 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 12:52:05 +0000 |
commit | afde9626089e3d0c32090120960d1e32f65e3be4 (patch) | |
tree | d986b671aee7ee9fd984b373223a5aad31aa4a53 /drivers/thermal | |
parent | 2daa79ec2126f8e710391e9d8e8f0d31d7c91d5f (diff) | |
parent | 64a38516ff50c3f6c1ef563c2f410db3239d9302 (diff) | |
download | blackbird-op-linux-afde9626089e3d0c32090120960d1e32f65e3be4.tar.gz blackbird-op-linux-afde9626089e3d0c32090120960d1e32f65e3be4.zip |
Merge branch 'features/cs89x0' of git://git.pengutronix.de/git/imx/linux-2.6 into next/drivers
* 'features/cs89x0' of git://git.pengutronix.de/git/imx/linux-2.6:
CS89x0 : add CS89x0 platform device to the iMX31ADS board
CS89x0 : remove QQ2440 board support from the CS89x0 driver
CS89x0 : add CS89x0 platform device to the iMX21ADS board
CS89x0 : add platform driver support
Diffstat (limited to 'drivers/thermal')
0 files changed, 0 insertions, 0 deletions