summaryrefslogtreecommitdiff
path: root/mm/swapfile.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-04-29 13:37:31 +0100
committerMark Brown <broonie@kernel.org>2015-04-29 13:37:31 +0100
commitd839c98f98826f0c13e46d5a4cecb46dd357b50e (patch)
treeaeffd33ff490a413ef5703cdacdae9f81ee650c9 /mm/swapfile.c
parenta78001b0137e3dd7acb15f6813bf2e5046d2f2ff (diff)
parent60a8d62b8497c23eb3d48149af7e55dac2dd83a2 (diff)
parentc479163a1b6ab424786fbcd9225b4e3c1c58eb0b (diff)
parent427ced4b203dfea4f08b1298cd1f88e19039fca4 (diff)
Merge remote-tracking branches 'asoc/fix/rt5677', 'asoc/fix/samsung' and 'asoc/fix/tfa9879' into asoc-linus