]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commitdiff
projects / can-eth-gw-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6e3a78d 21c8715)
Merge branch 'fixes2' into fixes
authorOlof Johansson <olof@lixom.net>
Tue, 9 Oct 2012 15:48:51 +0000 (08:48 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 9 Oct 2012 15:48:51 +0000 (08:48 -0700)
Three more warnings fixes from Arnd Bergmann:

* fixes2:
  ARM: integrator: use __iomem pointers for MMIO, part 2
  ARM: assabet: fix bogus warning in get_assabet_scr (again)
  ARM: shmobile: mark shmobile_init_late as __init


Trivial merge