Linus Torvalds 0c93ea4064 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 ...

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (61 commits)
  Dynamic debug: fix pr_fmt() build error
  Dynamic debug: allow simple quoting of words
  dynamic debug: update docs
  dynamic debug: combine dprintk and dynamic printk
  sysfs: fix some bin_vm_ops errors
  kobject: don't block for each kobject_uevent
  sysfs: only allow one scheduled removal callback per kobj
  Driver core: Fix device_move() vs. dpm list ordering, v2
  Driver core: some cleanup on drivers/base/sys.c
  Driver core: implement uevent suppress in kobject
  vcs: hook sysfs devices into object lifetime instead of "binding"
  driver core: fix passing platform_data
  driver core: move platform_data into platform_device
  sysfs: don't block indefinitely for unmapped files.
  driver core: move knode_bus into private structure
  driver core: move knode_driver into private structure
  driver core: move klist_children into private structure
  driver core: create a private portion of struct device
  driver core: remove polling for driver_probe_done(v5)
  sysfs: reference sysfs_dirent from sysfs inodes
  ...

Fixed conflicts in drivers/sh/maple/maple.c manually

2009-03-26 11:17:04 -07:00

..

irq

Merge branch 'core/xen' into x86/urgent

2009-02-04 14:54:56 +01:00

power

PM: Split up sysdev_[suspend|resume] from device_power_[down|up]

2009-02-22 10:33:44 -08:00

time

hrtimers: allow the hot-unplugging of all cpus

2009-01-30 22:35:29 +01:00

trace

tracing: limit the number of loops the ring buffer self test can make

2009-02-18 22:50:01 -05:00

.gitignore

…

acct.c

…

async.c

async: use list_move_tail

2009-02-08 10:00:26 -08:00

audit_tree.c

…

audit.c

…

audit.h

…

auditfilter.c

…

auditsc.c

…

backtracetest.c

…

bounds.c

…

capability.c

…

cgroup_debug.c

…

cgroup_freezer.c

…

cgroup.c

cgroups: fix possible use after free

2009-02-18 15:37:54 -08:00

compat.c

…

configs.c

…

cpu.c

…

cpuset.c

…

cred-internals.h

…

cred.c

…

delayacct.c

…

dma-coherent.c

…

dma.c

…

exec_domain.c

…

exit.c

signal: re-add dead task accumulation stats.

2009-02-05 13:04:33 +01:00

extable.c

…

fork.c

copy_process: fix CLONE_PARENT && parent_exec_id interaction

2009-03-09 13:23:25 -07:00

freezer.c

…

futex_compat.c

…

futex.c

futex: fix reference leak

2009-02-11 18:24:08 +01:00

hrtimer.c

hrtimer: prevent negative expiry value after clock_was_set()

2009-01-30 22:35:34 +01:00

itimer.c

timers: split process wide cpu clocks/timers

2009-02-05 13:04:33 +01:00

kallsyms.c

…

Kconfig.freezer

…

Kconfig.hz

…

Kconfig.preempt

…

kexec.c

PM: Split up sysdev_[suspend|resume] from device_power_[down|up]

2009-02-22 10:33:44 -08:00

kfifo.c

…

kgdb.c

…

kmod.c

…

kprobes.c

…

ksysfs.c

…

kthread.c

…

latencytop.c

…

lockdep_internals.h

…

lockdep_proc.c

…

lockdep.c

…

Makefile

PM: fix build for CONFIG_PM unset

2009-02-21 14:17:17 -08:00

marker.c

…

module.c

dynamic debug: combine dprintk and dynamic printk

2009-03-24 16:38:26 -07:00

mutex-debug.c

…

mutex-debug.h

…

mutex.c

…

mutex.h

…

notifier.c

…

ns_cgroup.c

…

nsproxy.c

…

panic.c

…

params.c

…

pid_namespace.c

…

pid.c

…

pm_qos_params.c

…

posix-cpu-timers.c

timers: more consistently use clock vs timer

2009-02-13 13:04:05 +01:00

posix-timers.c

…

printk.c

PM: Fix suspend_console and resume_console to use only one semaphore

2009-02-21 14:17:18 -08:00

profile.c

profiling: fix broken profiling regression

2009-02-10 00:50:37 +01:00

ptrace.c

…

rcuclassic.c

rcu: Teach RCU that idle task is not quiscent state at boot

2009-02-26 04:08:14 +01:00

rcupdate.c

rcu: Teach RCU that idle task is not quiscent state at boot

2009-02-26 04:08:14 +01:00

rcupreempt_trace.c

…

rcupreempt.c

rcu: Teach RCU that idle task is not quiscent state at boot

2009-02-26 04:08:14 +01:00

rcutorture.c

…

rcutree_trace.c

…

rcutree.c

rcu: Teach RCU that idle task is not quiscent state at boot

2009-02-26 04:08:14 +01:00

relay.c

…

res_counter.c

…

resource.c

…

rtmutex_common.h

…

rtmutex-debug.c

…

rtmutex-debug.h

…

rtmutex-tester.c

…

rtmutex.c

…

rtmutex.h

…

rwsem.c

…

sched_clock.c

…

sched_cpupri.c

…

sched_cpupri.h

…

sched_debug.c

…

sched_fair.c

sched: revert recent sync wakeup changes

2009-02-11 14:43:35 +01:00

sched_features.h

…

sched_idletask.c

…

sched_rt.c

sched_rt: don't use first_cpu on cpumask created with cpumask_and

2009-02-01 10:49:52 +01:00

sched_stats.h

timers: split process wide cpu clocks/timers

2009-02-05 13:04:33 +01:00

sched.c

sched: don't allow setuid to succeed if the user does not have rt bandwidth

2009-02-27 11:11:53 +01:00

seccomp.c

x86-64: seccomp: fix 32/64 syscall hole

2009-03-02 15:41:30 -08:00

semaphore.c

…

signal.c

fix ptrace slowness

2009-03-23 09:22:31 -07:00

smp.c

generic-ipi: use per cpu data for single cpu ipi calls

2009-01-30 18:31:08 +01:00

softirq.c

rcu: increment quiescent state counter in ksoftirqd()

2009-03-04 22:08:45 +01:00

softlockup.c

…

spinlock.c

…

srcu.c

…

stacktrace.c

…

stop_machine.c

…

sys_ni.c

…

sys.c

sched: don't allow setuid to succeed if the user does not have rt bandwidth

2009-02-27 11:11:53 +01:00

sysctl_check.c

…

sysctl.c

mm: fix dirty_bytes/dirty_background_bytes sysctls on 64bit arches

2009-02-11 14:25:35 -08:00

taskstats.c

…

test_kprobes.c

…

time.c

…

timeconst.pl

…

timer.c

…

tracepoint.c

…

tsacct.c

Fix fixpoint divide exception in acct_update_integrals

2009-03-09 08:13:35 -07:00

uid16.c

…

up.c

…

user_namespace.c

Fix recursive lock in free_uid()/free_user_ns()

2009-02-27 16:26:21 -08:00

user.c

Merge branch 'master' into next

2009-03-24 10:52:46 +11:00

utsname_sysctl.c

…

utsname.c

…

wait.c

wait: prevent exclusive waiter starvation

2009-02-05 12:56:48 -08:00

workqueue.c

…