David S. Miller 9cbc1cb8cd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: Documentation/feature-removal-schedule.txt drivers/scsi/fcoe/fcoe.c net/core/drop_monitor.c net/core/net-traces.c		2009-06-15 03:02:23 -07:00
..
accessibility
acpi
amba
ata	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
atm
auxdisplay
base	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
block	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
bluetooth	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
cdrom
char	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
clocksource
connector	trivial: Kconfig: .ko is normally not included in module names	2009-06-12 18:01:50 +02:00
cpufreq
cpuidle
crypto	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
dca
dio
dma
edac	trivial: fix typos s/paramter/parameter/ and s/excute/execute/ in documentation and source comments.	2009-06-12 18:01:46 +02:00
eisa
firewire
firmware
gpio
gpu	Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2009-06-12 18:09:18 -07:00
hid	Merge branches 'upstream' and 'ntrig-multitouch' into for-linus	2009-06-12 17:42:13 +02:00
hwmon
i2c	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2009-06-14 13:42:43 -07:00
ide	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
idle
ieee1394
ieee802154	ieee802154: fix kconfig bool/tristate muckup	2009-06-13 23:36:29 -07:00
infiniband	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
isdn	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
leds
lguest	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest	2009-06-12 09:32:26 -07:00
macintosh
mca
md
media	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
memstick
message	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
mfd	MFD,mmc: tmio_mmc: make HCLK configurable	2009-06-13 22:42:59 +02:00
misc	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
mmc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc	2009-06-14 13:46:57 -07:00
mtd	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
net	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
nubus
of	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
oprofile
parisc
parport
pci	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
pcmcia
platform
pnp	Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2009-06-12 18:09:18 -07:00
power
ps3
rapidio
regulator
rtc	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2009-06-14 13:42:43 -07:00
s390	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
sbus
scsi	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
serial	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
sh
sn
spi	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2009-06-14 13:42:43 -07:00
ssb
staging	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
tc
telephony
thermal
uio
usb	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
uwb
video	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2009-06-14 13:42:43 -07:00
virtio	virtio: enhance id_matching for virtio drivers	2009-06-12 22:16:40 +09:30
w1	trivial: Kconfig: .ko is normally not included in module names	2009-06-12 18:01:50 +02:00
watchdog	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
xen	PM core: rename suspend and resume functions	2009-06-12 21:32:31 +02:00
zorro
Kconfig
Makefile