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)
commit683b8a87302137659403ea8188cfaaecaf663ddc
tree58a317ee6ecacbb8827100e8b3c8d5ad82dfad1b
parent69149217c62689ea6ef06ad7178009b72c32a7f7
parent7dbd47b47141f043ba5d6377274c1f21b76ae7f7
Merge branches 'devel-hwspinlock' and 'devel-mcspi' into omap-for-linus