Merge commit '6e23063c469c0d90d14b376a696d87149e2a1aa4' into upstream-merge
commitd827966f6e42e933226ef08d43f5a9fe342211b9
authorMarcelo Tosatti <mtosatti@redhat.com>
Tue, 23 Aug 2011 13:54:59 +0000 (23 10:54 -0300)
committerMarcelo Tosatti <mtosatti@redhat.com>
Tue, 23 Aug 2011 13:54:59 +0000 (23 10:54 -0300)
tree11494aeda802f65b0d4989c7df1a1fa5bb1f63f0
parent52dae16d41e1712ffc1236e5a972e496dfbe8cfa
parent6e23063c469c0d90d14b376a696d87149e2a1aa4
Merge commit '6e23063c469c0d90d14b376a696d87149e2a1aa4' into upstream-merge

* commit '6e23063c469c0d90d14b376a696d87149e2a1aa4':
  microblaze-user: Deliver SIGFPE on div by zero
  memory: Fix old_portio vs non-zero offset
  memory: temporarily suppress the subregion collision warning

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>