Merge branch 'merge' into next

This commit is contained in:
Benjamin Herrenschmidt 2012-05-09 10:57:57 +10:00
commit ea4e89afed
15 changed files with 55 additions and 104 deletions