Merge remote-tracking branch 'rmk/for-next' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Tue, 10 Jul 2012 08:12:35 +0000 (01:12 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 10 Jul 2012 08:12:35 +0000 (01:12 -0700)

Trivial merge