From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 21 Jan 2009 15:37:27 +0000 (+0100)
Subject: Merge commit 'v2.6.29-rc2' into perfcounters/core
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=77835492ed489c0b870f82f4c50687bd267acc0a;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge commit 'v2.6.29-rc2' into perfcounters/core

Conflicts:
	include/linux/syscalls.h
---

77835492ed489c0b870f82f4c50687bd267acc0a
diff --cc include/linux/syscalls.h
index a1d177ce0a08,16875f89e6a7..fc81937009f5
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@@ -54,7 -54,7 +54,8 @@@ struct compat_stat
  struct compat_timeval;
  struct robust_list_head;
  struct getcpu_cache;
+ struct old_linux_dirent;
 +struct perf_counter_hw_event;
  
  #include <linux/types.h>
  #include <linux/aio_abi.h>