From: Ingo Molnar Date: Wed, 21 Jan 2009 15:37:27 +0000 (+0100) Subject: Merge commit 'v2.6.29-rc2' into perfcounters/core X-Git-Tag: v2.6.31-rc1~383^2~526 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77835492ed489c0b870f82f4c50687bd267acc0a;p=pandora-kernel.git Merge commit 'v2.6.29-rc2' into perfcounters/core Conflicts: include/linux/syscalls.h --- 77835492ed489c0b870f82f4c50687bd267acc0a Reading git-diff-tree failed