diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-05 09:58:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-05 09:58:37 -0700 |
| commit | f67d251a87ccb288a3a164c5226c6ee9ce8ea53d (patch) | |
| tree | bb54b8c8a06f06bd6d316452d442fd327fe0d712 /arch/arm/mach-vexpress/tc2_pm.c | |
| parent | 8e099d1e8be3f598dcefd04d3cd5eb3673d4e098 (diff) | |
| parent | 9a1a1aea7572179bebb7e9755be4c7d220e05cb4 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu fixes from Greg Ungerer:
"Just a couple of small fixes. Fix definition of page_to_phys() and
remove unecesary prototype of kobjsize()"
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68knommu: Remove unnecessary prototype for kobjsize()
m68knommu: Correct page_to_phys when PAGE_OFFSET is non-zero.
Diffstat (limited to 'arch/arm/mach-vexpress/tc2_pm.c')
0 files changed, 0 insertions, 0 deletions