David S. Miller 394efd19d5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be.h drivers/net/netconsole.c net/bridge/br_private.h Three mostly trivial conflicts. The net/bridge/br_private.h conflict was a function signature (argument addition) change overlapping with the extern removals from Joe Perches. In drivers/net/netconsole.c we had one change adjusting a printk message whilst another changed "printk(KERN_INFO" into "pr_info(". Lastly, the emulex change was a new inline function addition overlapping with Joe Perches's extern removals. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-11-04 13:48:30 -05:00
..
cpu	…
debug	…
events	perf: Fix perf ring buffer memory ordering	2013-10-29 12:01:19 +01:00
gcov	…
irq	…
power	PM / hibernate: Move software_resume to late_initcall_sync	2013-10-25 01:58:49 +02:00
printk	…
sched	…
time	clockevents: Sanitize ticks to nsec conversion	2013-10-23 12:51:21 +02:00
trace	…
.gitignore	…
Kconfig.freezer	…
Kconfig.hz	…
Kconfig.locks	…
Kconfig.preempt	…
Makefile	…
acct.c	…
async.c	…
audit.c	…
audit.h	…
audit_tree.c	…
audit_watch.c	…
auditfilter.c	…
auditsc.c	…
backtracetest.c	…
bounds.c	…
capability.c	…
cgroup.c	Merge branch 'for-3.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup	2013-10-22 08:20:34 +01:00
cgroup_freezer.c	…
compat.c	…
configs.c	…
context_tracking.c	…
cpu.c	…
cpu_pm.c	…
cpuset.c	…
crash_dump.c	…
cred.c	…
delayacct.c	…
dma.c	…
elfcore.c	…
exec_domain.c	…
exit.c	…
extable.c	…
fork.c	…
freezer.c	…
futex.c	…
futex_compat.c	…
groups.c	…
hrtimer.c	…
hung_task.c	…
irq_work.c	…
itimer.c	…
jump_label.c	static_key: WARN on usage before jump_label_init was called	2013-10-19 19:45:35 -04:00
kallsyms.c	…
kcmp.c	…
kexec.c	…
kmod.c	…
kprobes.c	…
ksysfs.c	…
kthread.c	…
latencytop.c	…
lglock.c	…
lockdep.c	…
lockdep_internals.h	…
lockdep_proc.c	…
lockdep_states.h	…
modsign_certificate.S	…
modsign_pubkey.c	…
module-internal.h	…
module.c	…
module_signing.c	…
mutex-debug.c	…
mutex-debug.h	…
mutex.c	mutex: Avoid gcc version dependent __builtin_constant_p() usage	2013-10-18 21:58:54 +02:00
mutex.h	…
notifier.c	…
nsproxy.c	…
padata.c	…
panic.c	…
params.c	…
pid.c	…
pid_namespace.c	…
posix-cpu-timers.c	…
posix-timers.c	…
profile.c	…
ptrace.c	…
range.c	…
rcu.h	…
rcupdate.c	…
rcutiny.c	…
rcutiny_plugin.h	…
rcutorture.c	…
rcutree.c	…
rcutree.h	…
rcutree_plugin.h	…
rcutree_trace.c	…
reboot.c	…
relay.c	…
res_counter.c	…
resource.c	…
rtmutex-debug.c	…
rtmutex-debug.h	…
rtmutex-tester.c	…
rtmutex.c	…
rtmutex.h	…
rtmutex_common.h	…
rwsem.c	…
seccomp.c	…
semaphore.c	…
signal.c	…
smp.c	…
smpboot.c	…
smpboot.h	…
softirq.c	…
spinlock.c	…
srcu.c	…
stacktrace.c	…
stop_machine.c	…
sys.c	…
sys_ni.c	…
sysctl.c	…
sysctl_binary.c	…
task_work.c	…
taskstats.c	…
test_kprobes.c	…
time.c	…
timeconst.bc	…
timer.c	…
tracepoint.c	…
tsacct.c	…
uid16.c	…
up.c	…
user-return-notifier.c	…
user.c	…
user_namespace.c	…
utsname.c	…
utsname_sysctl.c	…
wait.c	…
watchdog.c	…
workqueue.c	…
workqueue_internal.h	…