Linus Torvalds a6f707b601 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia ... Pull a few PCMCIA updates from Dominik Brodowski. Fix up trivial conflict (modified code in question had been removed) in drivers/pcmcia/soc_common.c. * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia: pcmcia at91_cf: fix raw gpio number usage ARM: pxa: fix error handling in pxa2xx_drv_pcmcia_probe pcmcia: Convert to DEFINE_PCI_DEVICE_TABLE pcmcia: convert drivers/pcmcia/* to use module_platform_driver() pcmcia: irq: Remove IRQF_DISABLED		2012-03-29 16:00:48 -07:00
..
accessibility	…
acpi	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
amba	…
ata	…
atm	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
auxdisplay	…
base	Merge branch 'for-linus-3.4' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf	2012-03-28 15:02:41 -07:00
bcma	…
block	Merge branch 'akpm' (Andrew's patch-bomb)	2012-03-28 17:19:28 -07:00
bluetooth	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
cdrom	…
char	Merge branch 'akpm' (Andrew's patch-bomb)	2012-03-28 17:19:28 -07:00
clk	…
clocksource	ARM: device tree work	2012-03-27 16:47:35 -07:00
connector	…
cpufreq	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
cpuidle	…
crypto	…
dca	…
devfreq	ARM: global cleanups	2012-03-27 16:03:32 -07:00
dio	…
dma	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-03-29 15:34:57 -07:00
edac	Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac	2012-03-28 14:24:40 -07:00
eisa	…
firewire	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
firmware	…
gpio	GPIO changes for v3.4	2012-03-28 14:08:46 -07:00
gpu	drm/i915: suspend fbdev device around suspend/hibernate	2012-03-29 07:44:27 +01:00
hid	…
hv	…
hwmon	MFD changes for 3.4	2012-03-28 13:56:35 -07:00
hwspinlock	…
i2c	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
ide	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
idle	…
ieee802154	…
infiniband	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
input	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
iommu	…
isdn	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
leds	MFD changes for 3.4	2012-03-28 13:56:35 -07:00
lguest	…
macintosh	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
mca	…
md	dm: add verity target	2012-03-28 18:43:38 +01:00
media	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-03-29 15:34:57 -07:00
memstick	…
message	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
mfd	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
misc	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
mmc	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-03-29 15:34:57 -07:00
mtd	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-03-29 15:34:57 -07:00
net	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-03-29 15:34:57 -07:00
nfc	…
nubus	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
of	GPIO changes for v3.4	2012-03-28 14:08:46 -07:00
oprofile	…
parisc	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
parport	…
pci	…
pcmcia	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia	2012-03-29 16:00:48 -07:00
pinctrl	…
platform	Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86	2012-03-28 14:20:23 -07:00
pnp	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
power	…
pps	…
ps3	…
ptp	…
rapidio	…
regulator	ARM: driver specific updates	2012-03-27 16:41:24 -07:00
remoteproc	…
rpmsg	…
rtc	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-29 14:16:48 -07:00
s390	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
sbus	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
scsi	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
sfi	…
sh	…
sn	…
spi	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-03-29 15:34:57 -07:00
ssb	…
staging	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
target	…
tc	…
thermal	…
tty	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-03-29 15:34:57 -07:00
uio	…
usb	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-03-29 15:34:57 -07:00
uwb	…
vhost	…
video	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-03-29 15:34:57 -07:00
virt	…
virtio	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
vlynq	…
w1	…
watchdog	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
xen	…
zorro	…
Kconfig	remoteproc/rpmsg: new subsystem	2012-03-27 16:30:09 -07:00
Makefile	remoteproc/rpmsg: new subsystem	2012-03-27 16:30:09 -07:00