Merge branch 'linus' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3
authorTony Lindgren <tony@atomide.com>
Fri, 9 Nov 2012 22:58:01 +0000 (14:58 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 9 Nov 2012 22:58:01 +0000 (14:58 -0800)

Trivial merge