Merge remote-tracking branch 'rmk/for-next' into tmp-merge for testing
authorTony Lindgren <tony@atomide.com>
Tue, 3 Jul 2012 11:17:24 +0000 (04:17 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 3 Jul 2012 11:17:24 +0000 (04:17 -0700)

Trivial merge