From: Arnd Bergmann Date: Tue, 4 Sep 2012 13:07:35 +0000 (+0200) Subject: Merge branch 'cleanup/io-pci' into next/cleanup X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3fbb96d275989c604b343b9e39aeea50386756e9;p=linux-beck.git 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 --- 3fbb96d275989c604b343b9e39aeea50386756e9