Benjamin Herrenschmidt 84c3d4aaec Merge commit 'origin/master' ... Manual merge of: arch/powerpc/Kconfig arch/powerpc/kernel/stacktrace.c arch/powerpc/mm/slice.c arch/ppc/kernel/smp.c		2008-07-16 11:07:59 +10:00
..
accessibility
acpi	Merge branch 'generic-ipi' into generic-ipi-for-linus	2008-07-15 21:55:59 +02:00
amba
ata	Merge commit 'origin/master'	2008-07-16 11:07:59 +10:00
atm	firmware: convert Ambassador ATM driver to request_firmware()	2008-07-10 14:49:39 +01:00
auxdisplay	Miguel Ojeda has moved	2008-07-04 10:40:05 -07:00
base	Merge branch 'core/topology' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-07-15 10:32:39 -07:00
block	block: convert pd_special_command to use blk_execute_rq	2008-07-15 21:21:45 +02:00
bluetooth	Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6	2008-07-14 16:54:07 -07:00
cdrom	cdrom: revert commit 22a9189 (cdrom: use kmalloced buffers instead of buffers on stack)	2008-07-04 09:52:14 +02:00
char	Merge commit 'origin/master'	2008-07-16 11:07:59 +10:00
clocksource	Fix printk format warning in clocksource/acpi_pm.c	2008-07-15 11:01:39 -07:00
connector
cpufreq
cpuidle
crypto	crypto: ixp4xx - Select CRYPTO_AUTHENC	2008-07-13 20:12:11 +08:00
dca
dio
dma
edac
eisa
firewire	Merge branch 'sbp2-spindown' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2008-07-15 12:39:44 -07:00
firmware	Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git	2008-07-14 15:51:11 -07:00
gpio	gpio: pca953x (i2c) handles max7310 too	2008-07-04 10:40:06 -07:00
gpu	drm/radeon: fixup issue with radeon and PAT support.	2008-07-15 15:48:05 +10:00
hid	Merge commit 'v2.6.26' into bkl-removal	2008-07-14 15:29:34 -06:00
hwmon	Merge commit 'origin/HEAD' into test-merge	2008-07-14 14:29:49 +10:00
i2c	Merge commit 'origin/master'	2008-07-16 11:07:59 +10:00
ide	ide-floppy: fix unfortunate function naming	2008-07-15 21:22:03 +02:00
ieee1394	Merge branch 'sbp2-spindown' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2008-07-15 12:39:44 -07:00
infiniband	Merge branch 'core/rcu' into core/rcu-for-linus	2008-07-15 21:10:12 +02:00
input	Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6	2008-07-14 14:48:31 -07:00
isdn	Merge commit 'v2.6.26' into bkl-removal	2008-07-14 15:29:34 -06:00
leds
lguest	Merge branch 'generic-ipi' into generic-ipi-for-linus	2008-07-15 21:55:59 +02:00
macintosh	Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build	2008-07-15 15:44:51 +10:00
mca
md	Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block	2008-07-14 13:15:14 -07:00
media	Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6	2008-07-14 16:54:07 -07:00
memstick
message	Merge commit 'v2.6.26' into bkl-removal	2008-07-14 15:29:34 -06:00
mfd
misc	Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6	2008-07-14 14:48:31 -07:00
mmc	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2008-07-14 16:06:58 -07:00
mtd	[MIPS] MTX-1 flash partition setup move to platform devices registration	2008-07-15 18:44:38 +01:00
net	Merge commit 'origin/master'	2008-07-16 11:07:59 +10:00
nubus
of	OpenFirmware: Include <linux/of_i2c.h> from of_i2c.c.	2008-07-12 12:10:52 -06:00
oprofile
parisc	parisc-eisa_eeprom: BKL pushdown	2008-07-02 15:06:24 -06:00
parport
pci	x86, VisWS: turn into generic arch, add early init quirks	2008-07-10 18:55:32 +02:00
pcmcia	Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build	2008-07-15 15:44:51 +10:00
pnp
power
ps3
rapidio	rapidio: fix device reference counting	2008-07-10 18:04:43 -07:00
rtc	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2008-07-14 16:06:58 -07:00
s390	Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6	2008-07-14 14:48:31 -07:00
sbus	Merge commit 'v2.6.26' into bkl-removal	2008-07-14 15:29:34 -06:00
scsi	Don't crash on IOMMU overflow in A100U2W driver	2008-07-15 14:30:56 -07:00
serial	Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build	2008-07-15 15:44:51 +10:00
sh
sn
spi	Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build	2008-07-15 15:44:51 +10:00
ssb	ssb-pcicore: Fix IRQ-vector init on embedded devices	2008-07-07 15:31:40 -04:00
tc
telephony
thermal
uio	Merge commit 'v2.6.26' into bkl-removal	2008-07-14 15:29:34 -06:00
usb	Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6	2008-07-14 16:54:07 -07:00
video	Merge commit 'origin/master'	2008-07-16 11:07:59 +10:00
virtio
w1
watchdog	Merge commit 'origin/master'	2008-07-16 11:07:59 +10:00
xen	Merge branch 'x86/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-07-14 13:43:24 -07:00
zorro
Kconfig
Makefile	drm: reorganise drm tree to be more future proof.	2008-07-14 10:45:01 +10:00