]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6348758 863e99a)
Merge branch 'cleanup/io-pci' into next/cleanup
authorArnd Bergmann <arnd@arndb.de>
Tue, 4 Sep 2012 13:07:35 +0000 (15:07 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 4 Sep 2012 13:07:35 +0000 (15:07 +0200)
commit3fbb96d275989c604b343b9e39aeea50386756e9
tree6a066ece039f798f7d5a6b44453fc889e0e1cf8atree | snapshot
parent63487589bf96bfd3fb7d5531f2d966f29ffe397dcommit | diff
parent863e99a8c1ea2b0391491904297f57a0f6a1fdd6commit | 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>
arch/arm/Kconfig diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules