Merge commit 'v2.6.36' into wip-merge-2.6.36

Conflicts:
	Makefile
	arch/x86/include/asm/unistd_32.h
	arch/x86/kernel/syscall_table_32.S
	kernel/sched.c
	kernel/time/tick-sched.c

Relevant API and functions changes (solved in this commit):
- (API) .enqueue_task() (enqueue_task_litmus),
  dequeue_task() (dequeue_task_litmus),
  [litmus/sched_litmus.c]
- (API) .select_task_rq() (select_task_rq_litmus)
  [litmus/sched_litmus.c]
- (API) sysrq_dump_trace_buffer() and sysrq_handle_kill_rt_tasks()
  [litmus/sched_trace.c]
- struct kfifo internal buffer name changed (buffer -> buf)
  [litmus/sched_trace.c]
- add_wait_queue_exclusive_locked -> __add_wait_queue_tail_exclusive
  [litmus/fmlp.c]
- syscall numbers for both x86_32 and x86_64

1 files changed, 1 insertions, 1 deletions

diff --git a/litmus/litmus.c b/litmus/litmus.c
index b04a42b0da9c..e854ba317762 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -488,7 +488,7 @@ void exit_litmus(struct task_struct *dead_tsk)
 #ifdef CONFIG_MAGIC_SYSRQ
 int sys_kill(int pid, int sig);
 
-static void sysrq_handle_kill_rt_tasks(int key, struct tty_struct *tty)
+static void sysrq_handle_kill_rt_tasks(int key)
 {
         struct task_struct *t;
         read_lock(&tasklist_lock);