Thomas Gleixner 90889a635a Merge branch 'fortglx/3.9/time' of git://git.linaro.org/people/jstultz/linux into timers/core ...

Trivial conflict in arch/x86/Kconfig

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

2013-02-04 11:03:03 +01:00

..

ftrace.c

pstore/ftrace: Adjust for ftrace_ops->func prototype change

2012-12-12 19:50:04 -08:00

inode.c

lseek: the "whence" argument is called "whence"

2012-12-17 17:15:12 -08:00

internal.h

efi_pstore: Add a sequence counter to a variable name

2012-11-26 16:07:44 -08:00

Kconfig

pstore/ftrace: Convert to its own enable/disable debugfs knob

2012-09-06 22:16:58 -07:00

Makefile

pstore: Add persistent function tracing

2012-07-17 10:05:52 -07:00

platform.c

efi_pstore: Add a sequence counter to a variable name

2012-11-26 16:07:44 -08:00

ram_core.c

pstore: remove __dev* attributes.

2013-01-03 15:57:14 -08:00

ram.c

Merge branch 'fortglx/3.9/time' of git://git.linaro.org/people/jstultz/linux into timers/core

2013-02-04 11:03:03 +01:00