Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus ... Conflicts: Documentation/filesystems/proc.txt arch/arm/mach-u300/include/mach/debug-macro.S drivers/net/qlge/qlge_ethtool.c drivers/net/qlge/qlge_main.c drivers/net/typhoon.c		2010-03-08 16:55:37 +01:00
..
accessibility
acpi	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
amba
ata	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
atm
auxdisplay
base	PM: Provide generic subsystem-level callbacks	2010-03-06 21:28:37 +01:00
block	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
bluetooth	Bluetooth: Convert Marvell driver to use per adapter debugfs	2010-02-27 14:05:38 +01:00
cdrom
char	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
clocksource	MFGPT: move clocksource menu	2010-03-06 11:26:28 -08:00
connector
cpufreq
cpuidle	cpuidle menu: remove 8 bytes of padding on 64 bit builds	2010-03-06 11:26:28 -08:00
crypto	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
dca
dio
dma	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
edac	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp	2010-03-03 09:25:37 -08:00
eisa	eisa: fix coding style for eisa bus code	2010-03-06 11:26:32 -08:00
firewire	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2010-03-03 08:08:44 -08:00
firmware	memory-hotplug: create /sys/firmware/memmap entry for new memory	2010-03-06 11:26:25 -08:00
gpio	mfd: Fix lpc_sch related depends/selects, fix build error	2010-03-07 22:17:38 +01:00
gpu	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
hid	USB: Push BKL on open down into the drivers	2010-03-02 14:54:23 -08:00
hwmon	Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2010-03-06 11:33:09 -08:00
i2c	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
ide	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6	2010-03-04 08:24:06 -08:00
idle
ieee1394	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
ieee802154
infiniband	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
input	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
isdn	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
leds	led: Enable led in 88pm860x	2010-03-07 22:17:05 +01:00
lguest
macintosh	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-03-01 10:38:09 -08:00
mca
md	dm raid1: fix deadlock when suspending failed device	2010-03-06 02:32:35 +00:00
media	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
memstick
message	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
mfd	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
misc	lkdtm: add debugfs access and loosen KPROBE ties	2010-03-06 11:26:32 -08:00
mmc	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
mtd	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
net	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
nubus
of
oprofile
parisc	parisc: remove trailing space in messages	2010-03-06 22:54:09 +00:00
parport	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
pci	Merge branch 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-03-07 15:59:39 -08:00
pcmcia	pcmcia: disable pcmcia ioctl for !ARM, prepare for removal	2010-03-03 08:37:41 +01:00
platform	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
pnp
power	power_supply: Enable power supply of max8925	2010-03-07 22:17:17 +01:00
pps
ps3
rapidio
regulator	regulator: Add max8925 support	2010-03-07 22:17:08 +01:00
rtc	rtc: Enable rtc in max8925	2010-03-07 22:17:16 +01:00
s390	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
sbus
scsi	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
serial	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
sfi
sh
sn
spi	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
ssb
staging	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6	2010-03-07 15:49:12 -08:00
tc
telephony
thermal
uio
usb	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
uwb
vhost	vhost-net: restart tx poll on sk_sndbuf full	2010-02-28 19:50:33 +02:00
video	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
virtio	virtio: set pci bus master enable bit	2010-03-02 13:41:14 +02:00
vlynq
w1	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
watchdog	Merge with mainline to remove plat-omap/Kconfig conflict	2010-03-01 14:19:05 -08:00
xen	xen: add kconfig menu	2010-03-06 11:26:46 -08:00
zorro
Kconfig	MFGPT: move clocksource menu	2010-03-06 11:26:28 -08:00
Makefile