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/fmlp.c b/litmus/fmlp.c
index 03fa7358d5eb..a9a638576d69 100644
--- a/litmus/fmlp.c
+++ b/litmus/fmlp.c
@@ -148,7 +148,7 @@ static int do_fmlp_down(struct pi_semaphore* sem)
             waitqueue_active(&sem->wait)) {
                 /* we need to suspend */
                 tsk->state = TASK_UNINTERRUPTIBLE;
-                add_wait_queue_exclusive_locked(&sem->wait, &wait);
+                __add_wait_queue_tail_exclusive(&sem->wait, &wait);
 
                 TRACE_CUR("suspends on PI lock %p\n", sem);
                 litmus->pi_block(sem, tsk);