From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 8 Apr 2009 08:35:30 +0000 (+0200)
Subject: Merge commit 'v2.6.30-rc1' into perfcounters/core
X-Git-Tag: v2.6.31-rc1~383^2~389
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ea472a77f8e4811ceee3f44a9deda6ad6e8b789;p=pandora-kernel.git

Merge commit 'v2.6.30-rc1' into perfcounters/core

Conflicts:
	arch/powerpc/include/asm/systbl.h
	arch/powerpc/include/asm/unistd.h
	include/linux/init_task.h

Merge reason: the conflicts are non-trivial: PowerPC placement
              of sys_perf_counter_open has to be mixed with the
	      new preadv/pwrite syscalls.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

5ea472a77f8e4811ceee3f44a9deda6ad6e8b789
Reading git-diff-tree failed