tree 452c46fda56fa07f6e653e16616a763c14366d83
parent 77e77e1b61b422698a17da9eaafe6ce89dc242e2
parent 762be29733d5b02b4359691f64c0cc968cd23c93
author Arnd Bergmann <arnd@arndb.de> 1342630646 +0200
committer Arnd Bergmann <arnd@arndb.de> 1342630646 +0200

Merge tag 'ep93xx-devel-for-3.6' of git://github.com/RyanMallon/linux-ep93xx into next/soc

From Ryan Mallon <rmallon@gmail.com>:

* tag 'ep93xx-devel-for-3.6' of git://github.com/RyanMallon/linux-ep93xx:
  ep93xx: Add IDE support to edb93xx boards
  ep93xx: IDE driver platform support code

Signed-off-by: Arnd Bergmann <arnd@arndb.de>