]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0417459 3e4e339)
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)
commitc0954e7d3167320a2d0ef563e8ace6a8c6cd93d3
tree6a066ece039f798f7d5a6b44453fc889e0e1cf8atree | snapshot
parent041745955551a43c8ef5c662594ed9cb41a4019acommit | diff
parent3e4e33983e5c9057bf7b1e20b87795af751a5395commit | 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 Source Tree.