David S. Miller 278554bd65 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: Documentation/feature-removal-schedule.txt drivers/net/wireless/ath/ar9170/usb.c drivers/scsi/iscsi_tcp.c net/ipv4/ipmr.c		2010-05-12 00:05:35 -07:00
..
accessibility
acpi	ACPI: sleep: eliminate duplicate entries in acpisleep_dmi_table[]	2010-05-11 10:07:53 -07:00
amba
ata	pata_pcmcia / ide-cs: Fix bad hashes for Transcend and kingston IDs	2010-05-05 14:48:48 -04:00
atm	net: sk_sleep() helper	2010-04-20 16:37:13 -07:00
auxdisplay
base
block	Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-linus	2010-05-04 08:48:53 +02:00
bluetooth	Bluetooth: Set hdev->dev_type based on Marvell device type	2010-05-10 09:34:04 +02:00
cdrom
char	tty: Fix regressions in the char driver conversion	2010-04-30 09:20:33 -07:00
clocksource
connector
cpufreq	Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq	2010-04-24 11:35:21 -07:00
cpuidle	cpuidle: Fix incorrect optimization	2010-05-09 18:35:36 -07:00
crypto
dca
dio
dma	Merge branch 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2010-05-06 08:37:39 -07:00
edac	edac, mce: Fix wrong mask and macro usage	2010-04-30 10:15:39 -07:00
eisa
firewire	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2010-04-22 12:54:54 -07:00
firmware
gpio	it8761e_gpio: fix bug in gpio numbering	2010-05-11 17:33:41 -07:00
gpu	drivers/gpu/drm/i915/i915_irq.c:i915_error_object_create(): use correct kmap-atomic slot	2010-05-11 17:33:42 -07:00
hid	HID: fix suspend crash by moving initializations earlier	2010-05-07 23:33:52 +02:00
hwmon	Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2010-05-11 17:38:04 -07:00
i2c	i2c-core: Use per-adapter userspace device lists	2010-05-04 11:09:28 +02:00
ide	pata_pcmcia / ide-cs: Fix bad hashes for Transcend and kingston IDs	2010-05-05 14:48:48 -04:00
idle
ieee1394
ieee802154
infiniband
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-05-05 07:53:18 -07:00
isdn	X25: Use identifiers for isdn device to x25 interface	2010-04-22 16:12:48 -07:00
leds
lguest
macintosh
mca
md	md: restore ability of spare drives to spin down.	2010-05-07 21:10:57 +10:00
media	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-05-12 00:05:35 -07:00
memstick
message
mfd
misc	VMware Balloon driver	2010-04-24 11:31:26 -07:00
mmc	mmc: atmel-mci: fix in debugfs: response value printing	2010-05-11 17:33:41 -07:00
mtd	[MTD] Remove zero-length files mtdbdi.c and internal.ho	2010-05-05 15:25:12 -04:00
net	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-05-12 00:05:35 -07:00
nubus
of	of: check for IS_ERR()	2010-04-28 01:07:29 -06:00
oprofile
parisc
parport
pci	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2010-04-29 17:16:36 -07:00
pcmcia	Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2010-05-07 14:11:09 -07:00
platform	eeepc-laptop: add missing sparse_keymap_free	2010-04-23 15:23:21 -04:00
pnp	Merge branches 'bugzilla-14337', 'bugzilla-14998', 'bugzilla-15407', 'bugzilla-15903' and 'misc-2.6.34' into release	2010-05-06 22:04:31 -04:00
power
pps
ps3
rapidio
regulator	regulator: fix enabling regulator issue on max8925	2010-04-28 15:24:34 +01:00
rtc
s390	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-05-12 00:05:35 -07:00
sbus
scsi	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-05-12 00:05:35 -07:00
serial	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2010-04-30 10:16:42 -07:00
sfi
sh
sn
spi	omap2_mcspi: small fixes of output data format	2010-04-28 01:25:43 -06:00
ssb	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem	2010-05-05 16:14:16 -04:00
staging	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-05-12 00:05:35 -07:00
tc
telephony
thermal
uio
usb	USB: sl811-hcd: Fix device disconnect	2010-04-30 09:25:12 -07:00
uwb
vhost
video	fbdev: bfin-t350mcqb-fb: fix fbmem allocation with blanking lines	2010-05-11 17:33:42 -07:00
virtio	virtio: Fix GFP flags passed from the virtio balloon driver	2010-04-22 07:34:05 -07:00
vlynq
w1	w1: fix omap 1-wire driver compilation	2010-04-24 11:31:25 -07:00
watchdog	watchdog: ep93xx_wdt.c fix default timout value in MODULE_PARM_DESC string.	2010-05-03 08:58:56 +00:00
xen
zorro
Kconfig
Makefile	virtio: initialize earlier	2010-05-07 14:01:17 -07:00