Merge tag 'ep93xx-devel-for-3.6' of git://github.com/RyanMallon/linux-ep93xx into...
authorArnd Bergmann <arnd@arndb.de>
Wed, 18 Jul 2012 16:57:26 +0000 (18:57 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 18 Jul 2012 16:57:26 +0000 (18:57 +0200)
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>

Trivial merge