Merge branch 'nes' into for-next
authorRoland Dreier <[email protected]>
Sun, 9 Dec 2012 04:45:48 +0000 (20:45 -0800)
committerRoland Dreier <[email protected]>
Sun, 9 Dec 2012 04:45:48 +0000 (20:45 -0800)

Trivial merge