Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus

Conflicts:

	include/linux/sunrpc/xprt.h
	net/sunrpc/xprtsock.c
Fix up conflicts with the workqueue changes.

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/input/serio/libps2.c b/drivers/input/serio/libps2.c
index e5b1b60757bb..b3e84d3bb7f7 100644
--- a/drivers/input/serio/libps2.c
+++ b/drivers/input/serio/libps2.c
@@ -251,9 +251,9 @@ EXPORT_SYMBOL(ps2_command);
  * ps2_schedule_command(), to a PS/2 device (keyboard, mouse, etc.)
  */
 
-static void ps2_execute_scheduled_command(void *data)
+static void ps2_execute_scheduled_command(struct work_struct *work)
 {
-        struct ps2work *ps2work = data;
+        struct ps2work *ps2work = container_of(work, struct ps2work, work);
 
         ps2_command(ps2work->ps2dev, ps2work->param, ps2work->command);
         kfree(ps2work);
@@ -278,7 +278,7 @@ int ps2_schedule_command(struct ps2dev *ps2dev, unsigned char *param, int comman
         ps2work->ps2dev = ps2dev;
         ps2work->command = command;
         memcpy(ps2work->param, param, send);
-        INIT_WORK(&ps2work->work, ps2_execute_scheduled_command, ps2work);
+        INIT_WORK(&ps2work->work, ps2_execute_scheduled_command);
 
         if (!schedule_work(&ps2work->work)) {
                 kfree(ps2work);