Merge branches 'devel-hwspinlock' and 'devel-mcspi' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Thu, 17 Feb 2011 18:01:18 +0000 (10:01 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 17 Feb 2011 18:01:18 +0000 (10:01 -0800)
commitdf7ffd317d36d36095c26bb57b3dd405274048e5
tree58a317ee6ecacbb8827100e8b3c8d5ad82dfad1b
parent7bb412a64281c599dcf00af2eed61ea997b282c2
parent1f1a4384b6500273020e48130f73601e4ba7d84b
Merge branches 'devel-hwspinlock' and 'devel-mcspi' into omap-for-linus