Merge remote-tracking branch 'rmk/for-next' into tmp-merge for testing
authorTony Lindgren <tony@atomide.com>
Fri, 6 Jul 2012 12:11:01 +0000 (05:11 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 6 Jul 2012 12:11:01 +0000 (05:11 -0700)

Trivial merge