diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-05-07 13:52:16 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-05-07 13:52:16 +1000 |
| commit | bcb1b8c75e30e9c39b6f162cffe59df9caaf27e4 (patch) | |
| tree | 4ab3f05bc3ef51b1296ca7a00ef7acdb7428e6f6 /localversion-sched-devel.git | |
| parent | f3636bd721198538840ec33389001280c3bd7452 (diff) | |
| parent | 553e3cc6fd94d3924617f1b36614606f12211219 (diff) | |
Merge commit 'sched-latest/latest'
Conflicts:
include/linux/stop_machine.h
kernel/stop_machine.c
Diffstat (limited to 'localversion-sched-devel.git')
| -rw-r--r-- | localversion-sched-devel.git | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/localversion-sched-devel.git b/localversion-sched-devel.git new file mode 100644 index 000000000000..4060b7ac0145 --- /dev/null +++ b/localversion-sched-devel.git @@ -0,0 +1 @@ +-sched-devel.git |