Merge branch 'for-linus' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 17 Jun 2008 16:02:44 +0000 (12:02 -0400)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 17 Jun 2008 16:02:44 +0000 (12:02 -0400)
Conflicts:

drivers/input/mouse/appletouch.c


Trivial merge