| commit | 3fbb96d275989c604b343b9e39aeea50386756e9 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Tue Sep 04 15:07:35 2012 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Tue Sep 04 15:07:35 2012 +0200 |
| tree | 6a066ece039f798f7d5a6b44453fc889e0e1cf8a | |
| parent | 63487589bf96bfd3fb7d5531f2d966f29ffe397d [diff] | |
| parent | 863e99a8c1ea2b0391491904297f57a0f6a1fdd6 [diff] |
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>