diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-17 08:08:22 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-17 08:08:22 -0700 |
| commit | 69648ae885e7de8be223362ea6e95c79066069e7 (patch) | |
| tree | 7b65497b095257fcb62f956460f94ffbe77f2374 /COPYING | |
| parent | 3d76f9f5d3f6c88c576ebd92c3e2edb6d6a27e6f (diff) | |
| parent | 11f93576b0b50bf391ffafa544b85e541f5e59a5 (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
From Simon Horman:
"Please consider the following fix for the KZM-A9-GT board for 3.7.
They both resolve fallout from recent IOMEM() changes."
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: r8a7779: use __iomem pointers for MMIO
ARM: shmobile: armadillo800eva: __io abuse cleanup
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions