Linus Torvalds 72eb6a7914 Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu ... * 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (30 commits) gameport: use this_cpu_read instead of lookup x86: udelay: Use this_cpu_read to avoid address calculation x86: Use this_cpu_inc_return for nmi counter x86: Replace uses of current_cpu_data with this_cpu ops x86: Use this_cpu_ops to optimize code vmstat: User per cpu atomics to avoid interrupt disable / enable irq_work: Use per cpu atomics instead of regular atomics cpuops: Use cmpxchg for xchg to avoid lock semantics x86: this_cpu_cmpxchg and this_cpu_xchg operations percpu: Generic this_cpu_cmpxchg() and this_cpu_xchg support percpu,x86: relocate this_cpu_add_return() and friends connector: Use this_cpu operations xen: Use this_cpu_inc_return taskstats: Use this_cpu_ops random: Use this_cpu_inc_return fs: Use this_cpu_inc_return in buffer.c highmem: Use this_cpu_xx_return() operations vmstat: Use this_cpu_inc_return for vm statistics x86: Support for this_cpu_add, sub, dec, inc_return percpu: Generic support for this_cpu_add, sub, dec, inc_return ... Fixed up conflicts: in arch/x86/kernel/{apic/nmi.c, apic/x2apic_uv_x.c, process.c} as per Tejun.		2011-01-07 17:02:58 -08:00
..
accessibility
acpi	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2011-01-07 17:02:58 -08:00
amba
ata	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
atm	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-01-04 11:57:25 -08:00
auxdisplay
base
block	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
bluetooth
cdrom	gdrom: don't use flush_scheduled_work()	2010-12-24 15:59:06 +01:00
char	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2011-01-07 17:02:58 -08:00
clk
clocksource	clocksource: sh_cmt: Remove nested spinlock fix	2010-12-17 19:38:33 +09:00
connector	connector: Use this_cpu operations	2010-12-17 15:18:05 +01:00
cpufreq	perf: Clean up power events by introducing new, more generic ones	2011-01-04 08:16:54 +01:00
cpuidle	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2011-01-07 17:02:58 -08:00
crypto
dca
dio
dma	dma: shdma: don't register the global die notifier multiple times	2011-01-07 11:03:26 +09:00
edac	Merge branch 'mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp	2011-01-07 14:54:03 -08:00
eisa
firewire
firmware
gpio	Merge branch 'devel-stable' into devel	2011-01-06 22:33:32 +00:00
gpu	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-01-07 14:45:47 -08:00
hwmon	hwmon: (s3c-hwmon) Fix compilation	2011-01-02 15:31:11 -08:00
i2c	I2C: i2c-omap: Change device name: i2c_omap -> omap_i2c	2010-12-20 17:53:04 -08:00
ide
idle	perf: Clean up power events by introducing new, more generic ones	2011-01-04 08:16:54 +01:00
ieee802154
infiniband	Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin	2011-01-07 08:56:33 -08:00
input	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2011-01-07 17:02:58 -08:00
isdn	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
leds	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
lguest
macintosh	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
mca
md	Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block	2010-12-20 09:19:46 -08:00
media	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
memstick
message
mfd	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
misc	ioc4: use static work_struct for ioc4_load_modules()	2010-12-24 16:14:20 +01:00
mmc	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
mtd	Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin	2011-01-07 08:56:33 -08:00
net	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
nubus
of	of/i2c: Fix request module by alias	2010-12-24 01:28:54 -07:00
oprofile
parisc
parport
pci	PCI hotplug: Fix unexpected driver unregister in pciehp_acpi.c	2010-12-23 12:51:49 -08:00
pcmcia	Merge branch 'devel-stable' into devel	2011-01-06 22:33:32 +00:00
platform	Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-01-06 11:06:31 -08:00
pnp
power	workqueue: convert cancel_rearming_delayed_work[queue]() users to cancel_delayed_work_sync()	2010-12-15 10:56:11 +01:00
pps
ps3
rapidio
regulator
rtc	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
s390	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2011-01-07 17:02:58 -08:00
sbus
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2011-01-07 12:47:02 -08:00
serial	Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2011-01-07 14:50:14 -08:00
sfi
sh	sh: intc: Initialize radix tree gfp mask explicitly.	2010-12-24 19:38:37 +09:00
sn
spi	spi/m68knommu: Coldfire QSPI platform support	2010-12-29 23:28:25 -07:00
ssb	ssb: Use pci_is_pcie()	2010-12-22 15:43:26 -05:00
staging	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2011-01-07 17:02:58 -08:00
tc
telephony
thermal
tty	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-01-07 14:39:20 -08:00
uio
usb	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
uwb	Merge branch 'usb-next' into musb-merge	2010-12-16 10:05:06 -08:00
vhost	Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost	2010-12-14 11:33:23 -08:00
video	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
virtio
vlynq
w1
watchdog	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-01-06 16:50:35 -08:00
xen	xen: Use this_cpu_inc_return	2010-12-17 15:18:05 +01:00
zorro
Kconfig
Makefile	Merge branch 'smp' into misc	2011-01-06 22:32:03 +00:00