Merge commit 'v2.6.30' into next
Dmitry Torokhov [Thu, 11 Jun 2009 08:58:01 +0000 (01:58 -0700)]
1  2 
drivers/input/joydev.c
drivers/input/touchscreen/tsc2007.c

Simple merge
Simple merge