Merge branch 'nes' into for-next

This commit is contained in:
Roland Dreier 2012-12-08 20:45:48 -08:00
commit 01e0336598
4 changed files with 17 additions and 26 deletions