linux/drivers
Kumar Gala 83dad4c377 netdev: drop CONFIG_PPC_MERGE from Kconfig
Now that arch/ppc is dead CONFIG_PPC_MERGE is always defined for all
powerpc platforms so we don't need to depend on it.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
2008-09-24 22:11:53 -04:00
..
accessibility
acpi Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 2008-09-08 16:59:05 -07:00
amba
ata ahci: RAID mode SATA patch for Intel Ibex Peak DeviceIDs 2008-09-08 12:15:54 -04:00
atm drivers/atm: Use DIV_ROUND_UP 2008-09-22 19:22:58 -07:00
auxdisplay
base
block aoe: Fix OOPS after SKB queue changes. 2008-09-23 20:47:22 -07:00
bluetooth hci_usb: replace mb with smp_mb 2008-09-22 19:21:51 -07:00
cdrom
char
clocksource clocksource, acpi_pm.c: check for monotonicity 2008-09-06 15:33:33 +02:00
connector
cpufreq
cpuidle
crypto
dca
dio
dma
edac
eisa
firewire
firmware
gpio
gpu
hid
hwmon
i2c Merge branch 'sh/for-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 2008-09-05 14:30:58 -07:00
ide
ieee1394
infiniband
input Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2008-09-06 21:47:30 -07:00
isdn mISDN: misc timerdev fixes 2008-09-22 19:18:15 -07:00
leds
lguest
macintosh
mca
md
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
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 netdev: drop CONFIG_PPC_MERGE from Kconfig 2008-09-24 22:11:53 -04:00
nubus
of
oprofile
parisc
parport
pci PCI: fix pbus_size_mem() resource alignment for CardBus controllers 2008-09-04 01:33:59 -07:00
pcmcia
pnp
power
ps3
rapidio
regulator
rtc
s390 qeth: avoid qeth recovery problems 2008-09-24 20:47:57 -04:00
sbus
scsi
serial
sh
sn
spi
ssb
tc
telephony
thermal
uio
usb usbatm: Use skb_queue_walk_safe() instead of by-hand implementation. 2008-09-23 00:27:47 -07:00
video atmel_lcdfb: fix oops in rmmod when framebuffer fails to register 2008-09-05 14:39:38 -07:00
virtio
w1
watchdog
xen
zorro
Kconfig
Makefile