projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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>
1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
Unnamed repository; edit this file 'description' to name the repository.