Linus Torvalds 42c5920821 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: (23 commits) pcmcia: Fix ide-cs sparse warning pcmcia: ide-cs debugging bugfix pcmcia: allow for longer CIS firmware files pcmcia: cm40x0 cdev lock_kernel() pushdown pcmcia: (re)move {pcmcia,pccard}_get_status pcmcia: kill IN_CARD_SERVICES pcmcia: Remove unused header file code pcmcia: remove unused bulkmem.h pcmcia: simplify pccard_validate_cis pcmcia: carve out ioctl adjust function to pcmcia_ioctl pcmcia: irq probe can be done without risking an IRQ storm pcmcia: Fix ti12xx_2nd_slot_empty always failing pcmcia: check for pointer instead of pointer address pcmcia: switch cm4000_cs.c to unlocked_ioctl pcmcia: simplify rsrc_nonstatic attributes pcmcia: add support CompactFlash PCMCIA support for Blackfin. pcmcia: remove version.h pcmcia: cs: kill thread_wait pcmcia: i82365.c: check request_irq return value pcmcia: fix Alchemy warnings ...		2008-07-14 13:24:39 -07:00
..
accessibility
acorn/char
acpi	x86 ACPI: normalize segment descriptor register on resume	2008-07-05 08:25:40 +02:00
amba
ata	Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block	2008-07-14 13:15:14 -07:00
atm
auxdisplay	Miguel Ojeda has moved	2008-07-04 10:40:05 -07:00
base	mm: switch node meminfo Active & Inactive pages to Kbytes	2008-07-04 10:40:09 -07:00
block	Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block	2008-07-14 13:15:14 -07:00
bluetooth
cdrom	cdrom: revert commit 22a9189 (cdrom: use kmalloced buffers instead of buffers on stack)	2008-07-04 09:52:14 +02:00
char	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-07-14 13:24:39 -07:00
clocksource
connector	CONNECTOR: add a proc entry to list connectors	2008-06-27 20:03:24 -07:00
cpufreq
cpuidle
crypto
dca
dio
dma
edac
eisa
firewire	firewire: fw-sbp2: fix parsing of logical unit directories	2008-06-27 20:55:00 +02:00
firmware
gpio	gpio: pca953x (i2c) handles max7310 too	2008-07-04 10:40:06 -07:00
hid
hwmon	hdaps: add support for various newer Lenovo thinkpads	2008-07-04 10:40:06 -07:00
i2c	I2C: S3C2410: Add MODULE_ALIAS() for s3c2440 device.	2008-07-01 14:30:38 +01:00
ide	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-07-14 13:24:39 -07:00
ieee1394
infiniband	RDMA/cxgb3: Fix regression caused by class_device -> device conversion	2008-07-08 14:40:05 -07:00
input	drivers/input/ff-core.c needs <linux/sched.h>	2008-07-02 18:40:08 -07:00
isdn	drivers/isdn/i4l/isdn_common.c fix small resource leak	2008-07-12 14:33:41 -07:00
leds
lguest	x86: fix NULL pointer deref in __switch_to	2008-06-20 13:26:18 +02:00
macintosh
mca
md	Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block	2008-07-14 13:15:14 -07:00
media	ov7670: clean up ov7670_read semantics	2008-07-12 14:33:41 -07:00
memstick
message	[SCSI] fusion: default MSI to disabled for SPI and FC controllers	2008-07-12 08:18:11 -05:00
mfd
misc
mmc	pxamci: fix byte aligned DMA transfers	2008-07-06 10:37:40 -07:00
mtd	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-07-14 13:24:39 -07:00
net	Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block	2008-07-14 13:15:14 -07:00
nubus
of
oprofile
parisc
parport
pci	pci: VT3336 can't do MSI either	2008-07-04 10:40:05 -07:00
pcmcia	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-07-14 13:24:39 -07:00
pnp
power
ps3
rapidio	rapidio: fix device reference counting	2008-07-10 18:04:43 -07:00
rtc	rtc-pcf8563: add chip id	2008-07-12 14:33:42 -07:00
s390
sbus
scsi	Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block	2008-07-14 13:15:14 -07:00
serial	serial8250: sanity check nr_uarts on all paths.	2008-07-12 14:33:41 -07:00
sh
sn
spi	spi: fix the read path in spidev	2008-07-04 10:40:08 -07:00
ssb	ssb-pcicore: Fix IRQ-vector init on embedded devices	2008-07-07 15:31:40 -04:00
tc
telephony
thermal	thermal: Create CONFIG_THERMAL_HWMON=n	2008-06-25 19:25:42 -04:00
uio
usb	Fix name of Russell King in various comments	2008-07-10 18:04:43 -07:00
video	fbdev: bugfix for multiprocess defio	2008-07-12 14:33:41 -07:00
virtio
w1
watchdog	Revert "[WATCHDOG] hpwdt: Add CFLAGS to get driver working"	2008-06-24 13:09:26 +00:00
xen	xen: Avoid allocations causing swap activity on the resume path	2008-07-03 13:21:13 +02:00
zorro
Kconfig
Makefile