Merge branch 'merge' into next

Merge "merge" branch to bring in various bug fixes that are
going into 3.8
This commit is contained in:
Benjamin Herrenschmidt 2013-01-29 11:33:37 +11:00
commit dfd0436ad0
711 changed files with 13331 additions and 4075 deletions