summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-02-23 11:43:15 -0800
committerTony Lindgren <tony@atomide.com>2011-02-23 11:43:15 -0800
commitc3bbcf5dc3a0bee9db8f82cd7d10eedf02a3b5f5 (patch)
tree1a52393126be95454c49f34be63f1fe3a6a9a15f /arch/arm
parent04aa67dec63b61c1a8b9b6d001262250f1a92130 (diff)
parentadc5430b473db2842a96fcce1ffbd43049757d3b (diff)
parente49c4d27ab5ffd0d8707685af9ca2866a95660e8 (diff)
parent7715db5aeca09d853be4f2eb0bc688a970220621 (diff)
parentc497dd5594ed3ef97bc563b07e8c050618f745a3 (diff)
Merge branches 'devel-cleanup', 'devel-omap4', 'devel-board' and 'devel-nand' into omap-for-linus