summaryrefslogtreecommitdiffstats
path: root/include/asm-generic/resource.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-06-05 12:35:52 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-06-05 12:35:52 +0100
commit1fb333489fb917c704ad43e51b45c12f52215a9c (patch)
tree03c1aa24c1bed4ec01d9c68e4ca0619aa31d3571 /include/asm-generic/resource.h
parent20e7e364331d7b5590695a839a18a00547403f18 (diff)
parent3f8517e7937d04ac7df9082c741fefc9c873065b (diff)
parent8ef418c7178fa611d84e187bacb967880f6f5b69 (diff)
parent1c2f87c22566cd057bc8cde10c37ae9da1a1bb76 (diff)
downloadlinux-1fb333489fb917c704ad43e51b45c12f52215a9c.tar.gz
linux-1fb333489fb917c704ad43e51b45c12f52215a9c.tar.bz2
linux-1fb333489fb917c704ad43e51b45c12f52215a9c.zip
Merge branches 'alignment', 'fixes', 'l2c' (early part) and 'misc' into for-next