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

Trivial merge