Merge commit 'kumar/merge' into merge

This commit is contained in:
Benjamin Herrenschmidt 2010-01-15 13:40:03 +11:00
commit 291f8de2c6
52 changed files with 3351 additions and 1030 deletions