Merge branch 'u300/cleanup' into next/cleanup
authorOlof Johansson <olof@lixom.net>
Tue, 20 Dec 2011 18:05:59 +0000 (10:05 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 20 Dec 2011 18:05:59 +0000 (10:05 -0800)
* u300/cleanup:
  ARM: u300: delete memory.h


Trivial merge