tree d986b671aee7ee9fd984b373223a5aad31aa4a53
parent 2daa79ec2126f8e710391e9d8e8f0d31d7c91d5f
parent 64a38516ff50c3f6c1ef563c2f410db3239d9302
author Arnd Bergmann <arnd@arndb.de> 1330347125 +0000
committer Arnd Bergmann <arnd@arndb.de> 1330347125 +0000

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