Tejun Heo 384be2b18a Merge branch 'percpu-for-linus' into percpu-for-next ... Conflicts: arch/sparc/kernel/smp_64.c arch/x86/kernel/cpu/perf_counter.c arch/x86/kernel/setup_percpu.c drivers/cpufreq/cpufreq_ondemand.c mm/percpu.c Conflicts in core and arch percpu codes are mostly from commit ed78e1e078dd44249f88b1dd8c76dafb39567161 which substituted many num_possible_cpus() with nr_cpu_ids. As for-next branch has moved all the first chunk allocators into mm/percpu.c, the changes are moved from arch code to mm/percpu.c. Signed-off-by: Tejun Heo <tj@kernel.org>		2009-08-14 14:45:31 +09:00
..
accessibility
acpi	Merge branch 'misc-2.6.31' into release	2009-08-02 12:55:51 -04:00
amba
ata	ahci: add workaround for on-board 5723s on some gigabyte boards	2009-08-12 06:21:32 -04:00
atm
auxdisplay
base	PM / Driver Core: Kill dev_pm_ops platform warning for now	2009-08-10 23:41:18 +02:00
block
bluetooth
cdrom
char	pty: fix data loss when stopped (^S/^Q)	2009-08-10 13:31:18 -07:00
clocksource
connector
cpufreq	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
cpuidle
crypto
dca
dio
dma	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx	2009-07-30 16:46:31 -07:00
edac	amd64_edac: print debug statements only on error	2009-08-04 12:10:06 +02:00
eisa
firewire
firmware
gpio
gpu	drm/i915: silence vblank warnings	2009-08-09 12:25:29 +10:00
hid
hwmon
i2c	i2c-omap: OMAP3430 Silicon Errata 1.153	2009-07-30 01:03:24 +01:00
ide
idle
ieee1394
ieee802154
infiniband
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2009-08-07 10:42:14 -07:00
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-08-04 15:38:34 -07:00
leds
lguest	lguest and virtio: cleanup struct definitions to Linux style.	2009-07-30 16:03:46 +09:30
macintosh
mca
md	md: allow upper limit for resync/reshape to be set when array is read-only	2009-08-13 10:41:50 +10:00
media
memstick
message
mfd	mfd: twl4030 irq fixes	2009-08-04 20:31:32 +02:00
misc	cb710: use SG_MITER_TO_SG/SG_MITER_FROM_SG	2009-07-31 12:28:46 +02:00
mmc	drivers/mmc: correct error-handling code	2009-08-07 10:39:56 -07:00
mtd	Remove zero-length file drivers/mtd/maps/sbc8240.c	2009-08-12 06:29:57 -04:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-08-04 15:38:34 -07:00
nubus
of
oprofile
parisc	parisc: hppb.c - fix printk format strings	2009-08-02 15:42:39 +02:00
parport
pci	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-08-10 11:00:37 -07:00
pcmcia
platform	Merge branch 'bugzilla-13825' into release	2009-08-02 12:36:01 -04:00
pnp
power	Merge git://git.infradead.org/users/cbou/battery-2.6.31	2009-07-30 16:45:53 -07:00
pps
ps3
rapidio
regulator
rtc	rtc: mark if rtc-cmos drivers were successfully registered	2009-07-29 19:10:35 -07:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6	2009-08-04 15:38:10 -07:00
sbus
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-08-04 15:38:34 -07:00
serial	Merge master.kernel.org:/home/rmk/linux-2.6-arm	2009-08-07 10:46:51 -07:00
sh
sn
spi	spi: omap2_mcspi rxdma bugfix	2009-07-29 19:10:35 -07:00
ssb
staging	Staging: rspiusb: Fix buffer overflow	2009-08-07 16:12:03 -07:00
tc
telephony
thermal
uio
usb	USB: fix oops on disconnect in cdc-acm	2009-08-07 16:05:14 -07:00
uwb
video	i.MX31: fix framebuffer locking regressions	2009-08-07 10:39:56 -07:00
virtio	virtio: refactor find_vqs	2009-07-30 16:03:45 +09:30
vlynq
w1	drivers/w1/masters/omap_hdq.c: fix missing mutex unlock	2009-08-07 10:39:55 -07:00
watchdog	Merge master.kernel.org:/home/rmk/linux-2.6-arm	2009-08-07 10:46:51 -07:00
xen	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
zorro
Kconfig
Makefile