sugar/linux
1
0
Fork 0
Code Activity
Files
6ca09dfc9f180d038dcef93c167a833f43a8246f
linux/drivers
History
Mike Travis 7eb1955336 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask into merge-rr-cpumask 
Conflicts:
	arch/x86/kernel/io_apic.c
	kernel/rcuclassic.c
	kernel/sched.c
	kernel/time/tick-sched.c

Signed-off-by: Mike Travis <travis@sgi.com>
[ mingo@elte.hu: backmerged typo fix for io_apic.c ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-01-03 18:53:31 +01:00
..
accessibility
…
acpi
…
amba
…
ata
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2008-12-30 17:43:10 -08:00
atm
…
auxdisplay
…
base
…
block
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
2008-12-30 17:37:25 -08:00
bluetooth
…
cdrom
…
char
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
2008-12-30 17:37:25 -08:00
clocksource
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
2008-12-31 23:05:57 +10:30
connector
…
cpufreq
…
cpuidle
…
crypto
…
dca
…
dio
…
dma
…
edac
…
eisa
…
firewire
…
firmware
DMI: add dmi_match
2008-12-29 07:39:34 -05:00
gpio
…
gpu
drm/i915: fix modeset devname allocation + agp init return check.
2008-12-29 18:18:19 +10:00
hid
…
hwmon
…
i2c
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2008-12-30 17:36:49 -08:00
ide
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2008-12-30 17:36:49 -08:00
idle
…
ieee1394
…
infiniband
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
2008-12-31 23:05:57 +10:30
input
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2008-12-30 17:36:49 -08:00
isdn
…
leds
…
lguest
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask into merge-rr-cpumask
2009-01-03 18:53:31 +01:00
macintosh
…
mca
…
md
…
media
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
2008-12-30 17:41:32 -08:00
memstick
…
message
[SCSI] fusion: use ARRAY_SIZE
2008-12-29 11:24:17 -06:00
mfd
…
misc
…
mmc
…
mtd
…
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2008-12-30 17:43:10 -08:00
nubus
…
of
…
oprofile
…
parisc
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
2008-12-30 08:02:35 +10:30
parport
…
pci
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
2008-12-31 23:05:57 +10:30
pcmcia
…
pnp
percpu: fix percpu accessors to potentially !cpu_possible() cpus: pnpbios
2009-01-01 10:12:14 +10:30
power
…
ps3
…
rapidio
…
regulator
…
rtc
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2008-12-30 17:36:49 -08:00
s390
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2008-12-30 17:43:10 -08:00
sbus
…
scsi
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2008-12-30 17:43:10 -08:00
serial
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2008-12-30 17:36:49 -08:00
sh
…
sn
…
spi
…
ssb
…
staging
…
tc
…
telephony
…
thermal
…
uio
…
usb
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2008-12-30 17:36:49 -08:00
uwb
…
video
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2008-12-30 17:36:49 -08:00
virtio
virtio: add PCI device release() function
2008-12-30 09:26:10 +10:30
w1
…
watchdog
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
2008-12-29 18:08:11 +00:00
xen
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
2008-12-31 23:05:57 +10:30
zorro
…
Kconfig
…
Makefile
…