David S. Miller 28b4d5cc17 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ ... Conflicts: drivers/net/pcmcia/fmvj18x_cs.c drivers/net/pcmcia/nmclan_cs.c drivers/net/pcmcia/xirc2ps_cs.c drivers/net/wireless/ray_cs.c		2009-12-05 15:22:26 -08:00
..
accessibility
acpi	Merge branch 'thinkpad-2.6.32' into release	2009-11-25 00:43:08 -05:00
amba
ata	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2009-12-05 09:42:59 -08:00
atm	drivers/atm/solos-pci.c: fix warning/bug, clean up code	2009-11-18 05:03:32 -08:00
auxdisplay
base	PM: fix irq enable/disable in runtime PM code	2009-11-29 16:51:27 +01:00
block	aoe: prevent cache aliases	2009-12-01 16:32:20 -08:00
bluetooth	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-12-05 15:22:26 -08:00
cdrom
char	Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-12-05 09:49:07 -08:00
clocksource
connector
cpufreq	[CPUFREQ] Fix stale cpufreq_cpu_governor pointer	2009-11-17 23:15:04 -05:00
cpuidle
crypto
dca
dio
dma	shdma: fix initialization error handling	2009-11-22 12:10:10 -07:00
edac
eisa
firewire	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2009-11-30 13:58:23 -08:00
firmware
gpio	gpio: Langwell GPIO driver bugfixes	2009-12-01 16:32:19 -08:00
gpu	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel	2009-11-30 13:57:19 -08:00
hid
hwmon	hwmon: (adt7475) Fix sysfs file names	2009-11-16 12:45:40 +01:00
i2c	Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2009-11-30 14:50:44 -08:00
ide	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2009-12-05 09:42:59 -08:00
idle
ieee1394
ieee802154	ieee802154: merge cleanup	2009-12-02 01:13:11 -08:00
infiniband	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-18 22:19:03 -08:00
input	Input: i8042 - add Dell Vostro 1320, 1520 and 1720 to the reset list	2009-12-02 15:41:33 -08:00
isdn	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-12-05 15:22:26 -08:00
leds	leds-gpio: fix possible crash on OF device unbinding	2009-11-16 11:50:42 +00:00
lguest
macintosh
mca
md	md: revert incorrect fix for read error handling in raid1.	2009-12-01 17:30:59 +11:00
media	drivers/media/dvb/dvb-core/dvb_frontend.c: needs semaphore.h	2009-12-01 16:32:19 -08:00
memstick
message
mfd	mfd: Correct WM831X_MAX_ISEL_VALUE	2009-12-01 11:24:19 +01:00
misc	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-12-01 22:13:38 -08:00
mmc	[ARM] pxamci: call mmc_remove_host() before freeing resources	2009-12-02 22:58:19 +08:00
mtd	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2009-12-05 09:42:59 -08:00
net	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-12-05 15:22:26 -08:00
nubus
of
oprofile
parisc	parisc: led: Use for_each_netdev_rcu()	2009-11-10 20:54:43 -08:00
parport	pcmcia: rework the irq_req_t typedef	2009-11-28 18:03:14 +01:00
pci	Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-12-05 09:49:07 -08:00
pcmcia	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2009-12-05 09:42:59 -08:00
platform	Merge branch 'misc-2.6.32' into release	2009-11-25 01:01:29 -05:00
pnp
power
pps	pps: events reporting fix up	2009-11-12 07:26:01 -08:00
ps3
rapidio
regulator	regulator: Initialise wm831x structure pointor for ISINK driver	2009-12-02 19:37:16 +00:00
rtc	rtc-x1205: reset clock to sane state after power failure	2009-12-01 16:32:20 -08:00
s390	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-18 22:19:03 -08:00
sbus
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2009-12-05 09:42:59 -08:00
serial	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2009-12-05 09:42:59 -08:00
sfi
sh
sn
spi	SPI: spi_txx9: Fix bit rate calculation	2009-12-02 23:58:32 +00:00
ssb	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-12-05 15:22:26 -08:00
staging	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-12-05 15:22:26 -08:00
tc
telephony	pcmcia: use dynamic debug infrastructure, deprecate CS_CHECK (misc drivers)	2009-11-09 08:30:05 +01:00
thermal
uio	uio: pm_runtime_disable is needed if failed	2009-11-13 11:36:00 +09:00
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2009-12-05 09:42:59 -08:00
uwb
video	VIDEO: Correct use of request_region/request_mem_region	2009-12-02 23:58:32 +00:00
virtio
vlynq
w1
watchdog	[PATCH] rc32434_wdt: fix compilation failure	2009-12-02 12:47:24 +00:00
xen
zorro
Kconfig
Makefile