Linus Torvalds
26dcce0fab
Merge branch 'cpus4096-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
...
* 'cpus4096-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (31 commits)
NR_CPUS: Replace NR_CPUS in speedstep-centrino.c
cpumask: Provide a generic set of CPUMASK_ALLOC macros, FIXUP
NR_CPUS: Replace NR_CPUS in cpufreq userspace routines
NR_CPUS: Replace per_cpu(..., smp_processor_id()) with __get_cpu_var
NR_CPUS: Replace NR_CPUS in arch/x86/kernel/genapic_flat_64.c
NR_CPUS: Replace NR_CPUS in arch/x86/kernel/genx2apic_uv_x.c
NR_CPUS: Replace NR_CPUS in arch/x86/kernel/cpu/proc.c
NR_CPUS: Replace NR_CPUS in arch/x86/kernel/cpu/mcheck/mce_64.c
cpumask: Optimize cpumask_of_cpu in lib/smp_processor_id.c, fix
cpumask: Use optimized CPUMASK_ALLOC macros in the centrino_target
cpumask: Provide a generic set of CPUMASK_ALLOC macros
cpumask: Optimize cpumask_of_cpu in lib/smp_processor_id.c
cpumask: Optimize cpumask_of_cpu in kernel/time/tick-common.c
cpumask: Optimize cpumask_of_cpu in drivers/misc/sgi-xp/xpc_main.c
cpumask: Optimize cpumask_of_cpu in arch/x86/kernel/ldt.c
cpumask: Optimize cpumask_of_cpu in arch/x86/kernel/io_apic_64.c
cpumask: Replace cpumask_of_cpu with cpumask_of_cpu_ptr
Revert "cpumask: introduce new APIs"
cpumask: make for_each_cpu_mask a bit smaller
net: Pass reference to cpumask variable in net/sunrpc/svc.c
...
Fix up trivial conflicts in drivers/cpufreq/cpufreq.c manually
2008-07-23 18:37:44 -07:00
..
9p
9p: fix error path during early mount
2008-05-14 19:23:27 -05:00
802
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2008-07-18 02:39:39 -07:00
8021q
netdev: Handle ->addr_list_lock just like ->_xmit_lock for lockdep.
2008-07-22 14:16:42 -07:00
appletalk
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
atm
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
ax25
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
bluetooth
bluetooth: remove improper bluetooth class symlinks.
2008-07-21 21:54:51 -07:00
bridge
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
can
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
core
Merge branch 'cpus4096-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2008-07-23 18:37:44 -07:00
dccp
mib: add net to NET_INC_STATS_BH
2008-07-16 20:31:16 -07:00
decnet
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
econet
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
ethernet
ieee80211
wext: Emit event stream entries correctly when compat.
2008-06-16 18:50:49 -07:00
ipv4
tcp: Fix bitmask test in tcp_syn_options()
2008-07-21 18:45:34 -07:00
ipv6
ipv6: icmp6_dst_gc return change
2008-07-22 14:35:50 -07:00
ipx
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
irda
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2008-07-20 17:43:29 -07:00
iucv
Merge branch 'linus' into cpus4096-for-linus
2008-07-21 17:19:50 +02:00
key
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-06-13 20:52:39 -07:00
lapb
llc
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
mac80211
net_sched: Add qdisc_enqueue wrapper
2008-07-20 00:08:04 -07:00
netfilter
netfilter: nf_conntrack_sctp: fix sparse warnings
2008-07-21 10:11:02 -07:00
netlabel
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
netlink
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-07-05 23:08:07 -07:00
netrom
netdev: Handle ->addr_list_lock just like ->_xmit_lock for lockdep.
2008-07-22 14:16:42 -07:00
packet
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
rfkill
rfkill: ignore errors from rfkill_toggle_radio in rfkill_add_switch
2008-07-08 14:16:03 -04:00
rose
netdev: Handle ->addr_list_lock just like ->_xmit_lock for lockdep.
2008-07-22 14:16:42 -07:00
rxrpc
MIB: add struct net to UDP_INC_STATS_BH
2008-07-05 21:18:48 -07:00
sched
pkt_sched: make qdisc_class_hash_alloc() static
2008-07-22 14:20:11 -07:00
sctp
sctp: remove sctp_assoc_proc_exit()
2008-07-22 14:21:30 -07:00
sunrpc
Merge branch 'linus' into cpus4096-for-linus
2008-07-21 17:19:50 +02:00
tipc
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
unix
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-06-28 01:19:40 -07:00
wanrouter
net: Remove references to wan-router.txt in Kconfigs
2008-07-14 22:22:29 -07:00
wireless
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
x25
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
xfrm
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
compat.c
net: Use standard structures for generic socket address structures.
2008-07-19 22:35:47 -07:00
Kconfig
net: Add STP demux layer
2008-07-05 21:25:39 -07:00
Makefile
vlan: uninline __vlan_hwaccel_rx
2008-07-08 03:23:36 -07:00
nonet.c
socket.c
net: Use standard structures for generic socket address structures.
2008-07-19 22:35:47 -07:00
sysctl_net.c
net: remove CVS keywords
2008-06-11 21:00:38 -07:00
TUNABLE