tree 6a066ece039f798f7d5a6b44453fc889e0e1cf8a
parent 63487589bf96bfd3fb7d5531f2d966f29ffe397d
parent 863e99a8c1ea2b0391491904297f57a0f6a1fdd6
author Arnd Bergmann <arnd@arndb.de> 1346764055 +0200
committer Arnd Bergmann <arnd@arndb.de> 1346764055 +0200

Merge branch 'cleanup/io-pci' into next/cleanup

The io-pci series has gained a merge to resolve a nontrivial
conflict.

* cleanup/io-pci:
  ARM: Fix ioremap() of address zero

Also includes an update to Linux 3.6-rc3

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