Merge branches 'misc', 'nes' and 'srp' into for-next
Roland Dreier [Wed, 23 Mar 2011 18:13:37 +0000 (11:13 -0700)]

Trivial merge