Mark Brown 7d9aca39dc Merge remote-tracking branch 'regmap/topic/drivers' into regmap-next ...

Resolved simple add/add conflicts:
	drivers/base/regmap/internal.h
	drivers/base/regmap/regmap.c

2012-03-14 13:13:25 +00:00

..

events

Merge remote-tracking branch 'regmap/topic/drivers' into regmap-next

2012-03-14 13:13:25 +00:00

define_trace.h

Revert "tracing: Include module.h in define_trace.h"

2011-10-31 19:32:35 -04:00

ftrace.h

perf: Fix counter of ftrace events

2011-10-04 11:07:54 +02:00

syscall.h

…