Merge branch 'master' into for-linus

This commit is contained in:
Rafael J. Wysocki 2009-07-30 19:38:04 +02:00
commit 2e6713c766
134 changed files with 6318 additions and 6448 deletions