Merge remote-tracking branch 'rmk/for-next' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Mon, 9 Jul 2012 14:16:58 +0000 (07:16 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 9 Jul 2012 14:16:58 +0000 (07:16 -0700)

Trivial merge