diff options
author | Tony Lindgren <tony@atomide.com> | 2011-02-17 10:01:18 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-02-17 10:01:18 -0800 |
commit | df7ffd317d36d36095c26bb57b3dd405274048e5 (patch) | |
tree | 58a317ee6ecacbb8827100e8b3c8d5ad82dfad1b /arch/arm/mach-omap2/gpmc-nand.c | |
parent | 7bb412a64281c599dcf00af2eed61ea997b282c2 (diff) | |
parent | 1f1a4384b6500273020e48130f73601e4ba7d84b (diff) |
Merge branches 'devel-hwspinlock' and 'devel-mcspi' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/gpmc-nand.c')
0 files changed, 0 insertions, 0 deletions