Merge branch 'wm97xx'
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 24 Apr 2008 17:25:42 +0000 (13:25 -0400)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 24 Apr 2008 17:25:42 +0000 (13:25 -0400)

Trivial merge