Merge branch 'nes' into for-next

This commit is contained in:
Roland Dreier 2010-03-01 23:51:57 -08:00
commit 3bbddbada8
7 changed files with 284 additions and 290 deletions