summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/gpmc-nand.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-12-20 19:13:40 -0800
committerTony Lindgren <tony@atomide.com>2010-12-20 19:13:40 -0800
commit4584acc3ee236424b5d0b52f143d980cae3c2be5 (patch)
treebc085d6c81a5ee5e721bfe90d84487156c2b5944 /arch/arm/mach-omap2/gpmc-nand.c
parentf0c61d3d3c319def8feebb99682ae0223a41dffe (diff)
parentc7d3e9e801d72e86eb8a0f311453192a84f14412 (diff)
parentb89cd71a159b5edca4c429687e4af01708eb1b26 (diff)
Merge branches 'devel-iommu-mailbox' and 'devel-l2x0' into omap-for-linus