summaryrefslogtreecommitdiff
path: root/mm/fremap.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-11-09 20:47:00 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-11-09 20:47:00 +0400
commit19f15f0efdbdffeb29072208cfc666f61bf9897a (patch)
tree3fb72fcbe799de3cf52060df48383ff99a8290b4 /mm/fremap.c
parentfad8f9c0b28ff1b9c93ea91048c0be701407eb67 (diff)
parentcaae070c48f39b4f7312e7473f6d3576f426e7fb (diff)
parent24bc89716163b4e30c1b71c9f4bd020387b13c96 (diff)
downloadlinux-19f15f0efdbdffeb29072208cfc666f61bf9897a.tar.xz
Merge branches 'spi-core' and 'spi-tegra' into spi-next