tree ff2044385cbbdc78cb2d96f64713ab04a10bec95
parent 844e8a16f25568eefd02a6bfb40bdd9bc04704b8
parent bfd912c0dd119d98923494d0cbeee571df756b8a
author Olof Johansson <olof@lixom.net> 1324404359 -0800
committer Olof Johansson <olof@lixom.net> 1324404359 -0800

Merge branch 'u300/cleanup' into next/cleanup

* u300/cleanup:
  ARM: u300: delete memory.h