Kumar Gala 68e1ee62f0 powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks ... Now that arch/ppc is dead CONFIG_PPC_MERGE is always defined for all powerpc platforms and we want to get rid of CONFIG_PPC_MERGE use CONFIG_PPC instead. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>		2008-09-23 10:41:28 -05:00
..
accessibility
acpi	Merge branches 'smbus' and 'fujitsu-fix' into release-2.6.27	2008-09-04 14:33:03 +02:00
amba
ata	ahci: RAID mode SATA patch for Intel Ibex Peak DeviceIDs	2008-09-08 12:15:54 -04:00
atm	removed unused #include <linux/version.h>'s	2008-08-23 12:14:12 -07:00
auxdisplay
base	PM: Remove WARN_ON from device_pm_add	2008-08-21 10:15:37 -07:00
block	powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks	2008-09-23 10:41:28 -05:00
bluetooth
cdrom
char	powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks	2008-09-23 10:41:28 -05:00
clocksource	clocksource, acpi_pm.c: check for monotonicity	2008-09-06 15:33:33 +02:00
connector
cpufreq
cpuidle
crypto
dca
dio
dma
edac	removed unused #include <linux/version.h>'s	2008-08-23 12:14:12 -07:00
eisa
firewire	firewire: Kconfig help update	2008-08-19 18:47:56 +02:00
firmware	ibft: fix target info parsing in ibft module	2008-09-02 19:21:40 -07:00
gpio
gpu	drm/radeon: downgrade debug message from info to debug.	2008-09-01 08:51:52 +10:00
hid
hwmon	powerpc/drivers: Use linux/of_device.h instead of asm/of_device.h	2008-08-20 16:34:59 +10:00
i2c	powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks	2008-09-23 10:41:28 -05:00
ide	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6	2008-09-02 11:44:11 -07:00
ieee1394	ieee1394: sbp2: let nodemgr retry node updates during bus reset series	2008-08-19 18:47:56 +02:00
infiniband	IB/mlx4: Actually return L_Key and R_Key for fast register MRs	2008-08-27 14:40:38 -07:00
input	powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks	2008-09-23 10:41:28 -05:00
isdn
leds
lguest	lguest: update commentry	2008-08-26 00:19:28 +10:00
macintosh
mca
md	Fix problem with waiting while holding rcu read lock in md/bitmap.c	2008-09-01 12:48:13 +10:00
media	V4L/DVB (8881): gspca: After 'while (retry--) {...}', retry will be -1 but not 0.	2008-09-04 18:27:51 -03:00
memstick
message
mfd	removed unused #include <linux/version.h>'s	2008-08-23 12:14:12 -07:00
misc	Merge branch 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-acpi-2.6	2008-09-05 14:27:12 -07:00
mmc	drivers/mmc/card/block.c: fix refcount leak in mmc_block_open()	2008-09-05 14:39:38 -07:00
mtd	[MTD] [NAND] tmio_nand: fix base address programming	2008-09-05 15:34:35 +01:00
net	forcedeth: fix kexec regression	2008-09-05 14:39:37 -07:00
nubus
of	powerpc/ibmebus: Restore "name" sysfs attribute on ibmebus devices	2008-08-20 09:50:21 +10:00
oprofile	powerpc/cell/oprofile: Avoid double vfree of profile buffer	2008-08-26 10:24:46 +10:00
parisc
parport
pci	Merge branch 'linux-2.6'	2008-09-10 11:36:13 +10:00
pcmcia
pnp	powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks	2008-09-23 10:41:28 -05:00
power
ps3
rapidio
regulator
rtc	rtc-cmos: wake again from S5	2008-09-02 19:21:40 -07:00
s390	[S390] cio: allow offline processing for disconnected devices	2008-09-09 12:39:07 +02:00
sbus
scsi	remove blk_register_filter and blk_unregister_filter in gendisk	2008-08-29 11:47:07 +02:00
serial	cpm_uart: Pass actual dev ptr to dma_* in ucc and cpm_uart serial	2008-09-19 13:34:04 -05:00
sh
sn
spi
ssb
tc
telephony
thermal
uio	UIO: generic irq handling for some uio platform devices	2008-08-21 10:15:39 -07:00
usb	Merge master.kernel.org:/home/rmk/linux-2.6-arm	2008-09-08 15:50:19 -07:00
video	atmel_lcdfb: fix oops in rmmod when framebuffer fails to register	2008-09-05 14:39:38 -07:00
virtio	virtio_balloon: fix towards_target when deflating balloon	2008-08-26 00:19:25 +10:00
w1
watchdog	[WATCHDOG] removed unused #include <version.h>	2008-08-26 20:32:02 +00:00
xen	xen: fix 2.6.27-rc5 xen balloon driver warnings	2008-09-08 20:21:15 +02:00
zorro
Kconfig
Makefile