diff options
| author | Stephen Rothwell <[email protected]> | 2014-01-14 16:36:10 +1100 |
|---|---|---|
| committer | H. Peter Anvin <[email protected]> | 2014-01-13 21:56:54 -0800 |
| commit | f549ed1abc7e4f0292ce08c4143c64a610c8b2cb (patch) | |
| tree | e168309c33d435e65f3c96a02d5c4ebf830e4a14 /tools/perf/util/trace-event-scripting.c | |
| parent | b0c29f79ecea0b6fbcefc999e70f2843ae8306db (diff) | |
arch: Re-sort some Kbuild files to hopefully help avoid some conflicts
Checkin:
93ea02bb8435 arch: Clean up asm/barrier.h implementations using asm-generic/barrier.h
... unfortunately left some Kbuild files out of order, which caused
unnecessary merge conflicts, in particular with checkin:
e3fec2f74f7f lib: Add missing arch generic-y entries for asm-generic/hash.h
Put them back in order to make the upcoming merges cleaner.
Signed-off-by: Stephen Rothwell <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: H. Peter Anvin <[email protected]>
Cc: Geert Uytterhoeven <[email protected]>
Cc: "Paul E. McKenney" <[email protected]>
Cc: Mathieu Desnoyers <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: David Miller <[email protected]>
Diffstat (limited to 'tools/perf/util/trace-event-scripting.c')
0 files changed, 0 insertions, 0 deletions