Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask into merge-rr-cpumask

Conflicts: arch/x86/kernel/io_apic.c kernel/rcuclassic.c kernel/sched.c kernel/time/tick-sched.c Signed-off-by: Mike Travis <travis@sgi.com> [ mingo@elte.hu: backmerged typo fix for io_apic.c ] Signed-off-by: Ingo Molnar <mingo@elte.hu>
2026-09-24 18:16:04 +00:00 · 2008-12-31 17:34:16 -08:00 · 2008-12-31 17:34:16 -08:00 · 7eb1955336
commit 7eb1955336
parent 6092848a2a 8c384cdee3
5078 changed files with 405279 additions and 254952 deletions
--- a/include/linux/aio.h
+++ b/include/linux/aio.h
--- a/include/linux/atm.h
+++ b/include/linux/atm.h
--- a/include/linux/atmdev.h
+++ b/include/linux/atmdev.h
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
--- a/include/linux/bottom_half.h
+++ b/include/linux/bottom_half.h
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
--- a/include/linux/cgroup_subsys.h
+++ b/include/linux/cgroup_subsys.h
--- a/include/linux/console.h
+++ b/include/linux/console.h
--- a/include/linux/cpumask.h
+++ b/include/linux/cpumask.h
--- a/include/linux/crc32c.h
+++ b/include/linux/crc32c.h
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
--- a/include/linux/dcbnl.h
+++ b/include/linux/dcbnl.h
--- a/include/linux/dccp.h
+++ b/include/linux/dccp.h
--- a/include/linux/dmi.h
+++ b/include/linux/dmi.h
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
--- a/include/linux/fault-inject.h
+++ b/include/linux/fault-inject.h
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
--- a/include/linux/fddidevice.h
+++ b/include/linux/fddidevice.h
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
--- a/include/linux/futex.h
+++ b/include/linux/futex.h
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
--- a/include/linux/hdlc.h
+++ b/include/linux/hdlc.h
--- a/include/linux/hippidevice.h
+++ b/include/linux/hippidevice.h
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
--- a/include/linux/if.h
+++ b/include/linux/if.h
--- a/include/linux/if_arp.h
+++ b/include/linux/if_arp.h
--- a/include/linux/in.h
+++ b/include/linux/in.h
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
--- a/include/linux/input.h
+++ b/include/linux/input.h
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
--- a/include/linux/jiffies.h
+++ b/include/linux/jiffies.h
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
--- a/include/linux/key-ui.h
+++ b/include/linux/key-ui.h
--- a/include/linux/key.h
+++ b/include/linux/key.h
--- a/include/linux/keyctl.h
+++ b/include/linux/keyctl.h
--- a/include/linux/lguest_launcher.h
+++ b/include/linux/lguest_launcher.h
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
--- a/include/linux/list_nulls.h
+++ b/include/linux/list_nulls.h
--- a/include/linux/lockd/bind.h
+++ b/include/linux/lockd/bind.h
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
--- a/include/linux/mdio-gpio.h
+++ b/include/linux/mdio-gpio.h
--- a/include/linux/mfd/wm8350/audio.h
+++ b/include/linux/mfd/wm8350/audio.h
--- a/include/linux/mii.h
+++ b/include/linux/mii.h
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
--- a/include/linux/mroute6.h
+++ b/include/linux/mroute6.h
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
--- a/include/linux/netfilter/nfnetlink_conntrack.h
+++ b/include/linux/netfilter/nfnetlink_conntrack.h
--- a/include/linux/netfilter_bridge/ebtables.h
+++ b/include/linux/netfilter_bridge/ebtables.h
--- a/include/linux/netfilter_ipv4/ipt_policy.h
+++ b/include/linux/netfilter_ipv4/ipt_policy.h
--- a/include/linux/netfilter_ipv6/ip6t_policy.h
+++ b/include/linux/netfilter_ipv6/ip6t_policy.h
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
--- a/include/linux/nfs_mount.h
+++ b/include/linux/nfs_mount.h
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
--- a/include/linux/nfsd/state.h
+++ b/include/linux/nfsd/state.h
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
--- a/include/linux/nsproxy.h
+++ b/include/linux/nsproxy.h
--- a/include/linux/of.h
+++ b/include/linux/of.h
--- a/include/linux/of_gpio.h
+++ b/include/linux/of_gpio.h
--- a/include/linux/of_platform.h
+++ b/include/linux/of_platform.h
--- a/include/linux/oprofile.h
+++ b/include/linux/oprofile.h
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
--- a/include/linux/posix-timers.h
+++ b/include/linux/posix-timers.h
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
--- a/include/linux/rcuclassic.h
+++ b/include/linux/rcuclassic.h
--- a/include/linux/rculist_nulls.h
+++ b/include/linux/rculist_nulls.h
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
--- a/include/linux/rcutree.h
+++ b/include/linux/rcutree.h
--- a/include/linux/rfkill.h
+++ b/include/linux/rfkill.h
--- a/include/linux/ring_buffer.h
+++ b/include/linux/ring_buffer.h
--- a/include/linux/rio_drv.h
+++ b/include/linux/rio_drv.h
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
--- a/Show more
+++ b/Show more