Merge branch 'thinkpad-2.6.33' into release

This commit is contained in:
Len Brown 2009-12-16 00:00:54 -05:00
commit 7458bbd044
2 changed files with 963 additions and 329 deletions