Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes

Browse source

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

...

This commit is contained in:

Olof Johansson 2012-10-17 08:08:22 -07:00

parent 3d76f9f5d3 11f93576b0

commit 69648ae885

2 changed files with 12 additions and 12 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/arm/mach-shmobile/board-armadillo800eva.c

View file

22

arch/arm/mach-shmobile/clock-r8a7779.c

View file