summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/swab.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-19 09:00:35 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-19 09:00:35 +0100
commit72c26c9a26ea7f2f3d14f162c2ebb07805f724ea (patch)
treebf1b4bc0b69f96c79474f9edb9cf0e811c95f2dc /arch/x86/include/asm/swab.h
parentMerge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core (diff)
parentMerge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff)
downloadlinux-72c26c9a26ea7f2f3d14f162c2ebb07805f724ea.tar.xz
linux-72c26c9a26ea7f2f3d14f162c2ebb07805f724ea.zip
Merge branch 'linus' into tracing/blktrace
Conflicts: block/blktrace.c Semantic merge: kernel/trace/blktrace.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/swab.h')
0 files changed, 0 insertions, 0 deletions