Merge commit 'v2.6.35-rc3' into next

2010-06-30 15:07:09 -07:00
parent 1796b983cc 7e27d6e778
commit 08fa16b6b7
1029 changed files with 83569 additions and 7903 deletions
@@ -613,7 +613,6 @@ static int __devexit synaptics_i2c_remove(struct i2c_client *client)
 		free_irq(client->irq, touch);

 	input_unregister_device(touch->input);
-	i2c_set_clientdata(client, NULL);
 	kfree(touch);

 	return 0;