diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-29 14:31:55 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-29 14:31:55 -0700 |
| commit | b10dcdcac43b2b5adf800a19f782fef38ada75a1 (patch) | |
| tree | f6434ef5e39978efd0ebd9bc9e269ecc381e4591 /fs/gfs2/aops.c | |
| parent | b0247eac31bde4b9572e28cd3dfd930dd4c5fb26 (diff) | |
| parent | e4d4a9027877593d80d71e8a93e39670b1881627 (diff) | |
Merge tag 'ep93xx-fixes-for-3.7' of git://github.com/RyanMallon/linux-ep93xx into next/fixes-non-critical
From Ryan Mallon:
* tag 'ep93xx-fixes-for-3.7' of git://github.com/RyanMallon/linux-ep93xx:
ARM: ep93xx: Move ts72xx.h out of include/mach
ARM: ep93xx: use __iomem pointers for MMIO
ARM: ep93xx: Fix build error due to 'SZ_32M' undeclared
Diffstat (limited to 'fs/gfs2/aops.c')
0 files changed, 0 insertions, 0 deletions