Linus Torvalds 2be4ff2f08 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits) pcmcia: ioctl-internal definitions pcmcia: cistpl header cleanup pcmcia: remove unused argument to pcmcia_parse_tuple() pcmcia: card services header cleanup pcmcia: device_id header cleanup pcmcia: encapsulate ioaddr_t pcmcia: cleanup device driver header file pcmcia: cleanup socket services header file pcmcia: merge ds_internal.h into cs_internal.h pcmcia: cleanup cs_internal.h pcmcia: cs_internal.h is internal pcmcia: use dev_printk for cs_error() pcmcia: remove CS_ error codes alltogether pcmcia: deprecate CS_BAD_TUPLE pcmcia: deprecate CS_BAD_ARGS pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGE pcmcia: deprecate CS_NO_MORE_ITEMS pcmcia: deprecate CS_IN_USE pcmcia: deprecate CS_CONFIGURATION_LOCKED ... Fix trivial conflict in drivers/pcmcia/ds.c manually		2008-10-13 14:12:40 -07:00
..
accessibility
acpi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2008-10-13 10:08:08 -07:00
amba
ata	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
atm	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-10-11 12:39:35 -07:00
auxdisplay
base	x86: memory corruption check - cleanup	2008-10-12 15:09:23 +02:00
block	Merge branch 'x86-core-v2-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-10-12 12:05:14 -07:00
bluetooth	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
cdrom
char	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
clocksource
connector
cpufreq
cpuidle
crypto
dca
dio
dma
edac
eisa
firewire
firmware
gpio
gpu
hid
hwmon	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-10-11 12:39:35 -07:00
i2c	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2008-10-11 10:09:45 -07:00
ide	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
ieee1394
infiniband	vfs: Use const for kernel parser table	2008-10-13 10:10:37 -07:00
input	Merge branch 'x86-core-v2-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-10-12 12:05:14 -07:00
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
leds	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-10-11 12:39:35 -07:00
lguest
macintosh
mca
md
media	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2008-10-13 14:03:59 -07:00
memstick
message
mfd	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2008-10-11 10:09:45 -07:00
misc
mmc	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-10-13 17:13:56 +01:00
mtd	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
nubus
of
oprofile	Merge branch 'linus' into oprofile-v2	2008-10-13 11:05:51 +02:00
parisc
parport	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
pci	Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B	2008-10-11 20:17:36 +02:00
pcmcia	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
pnp
power	Fix Kconfig dependency for WM97xx battery driver	2008-10-12 12:37:16 -07:00
ps3
rapidio
regulator
rtc	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-10-11 12:39:35 -07:00
s390	fs3270: Correct error returns	2008-10-13 09:51:44 -07:00
sbus
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
serial	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
sh
sn
spi
ssb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
tc
telephony
thermal
uio
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
video	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-10-13 17:13:56 +01:00
virtio
w1
watchdog	Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog	2008-10-12 11:51:32 -07:00
xen
zorro
Kconfig
Makefile