Merge branch 'wm97xx'
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 2 Apr 2008 14:02:43 +0000 (10:02 -0400)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 2 Apr 2008 14:02:43 +0000 (10:02 -0400)

Trivial merge