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, 2 insertions, 2 deletions

diff --git a/litmus/sched_trace.c b/litmus/sched_trace.c
index 1fa2094b0495..8051b51a2022 100644
--- a/litmus/sched_trace.c
+++ b/litmus/sched_trace.c
@@ -266,7 +266,7 @@ static int log_open(struct inode *in, struct file *filp)
 
         printk(KERN_DEBUG
                "sched_trace kfifo with buffer starting at: 0x%p\n",
-               (tbuf->buf.kfifo).buffer);
+               (tbuf->buf.kfifo).buf);
 
         /* override printk() */
         trace_override++;
@@ -340,7 +340,7 @@ void dump_trace_buffer(int max)
         trace_recurse = 0;
 }
 
-static void sysrq_dump_trace_buffer(int key, struct tty_struct *tty)
+static void sysrq_dump_trace_buffer(int key)
 {
         dump_trace_buffer(100);
 }