sugar/linux
1
0
Fork 0
Code Activity
Files
81990fbdd18b9cfdc93dc221ff3250f81468aed8
linux/drivers
History
James Morris ab2b49518e Merge branch 'master' into next 
Conflicts:

	MAINTAINERS

Thanks for breaking my tree :-)

Signed-off-by: James Morris <jmorris@namei.org>
2008-09-21 17:41:56 -07:00
..
accessibility
…
acpi
Merge branches 'smbus' and 'fujitsu-fix' into release-2.6.27
2008-09-04 14:33:03 +02:00
amba
…
ata
sata_inic162x: enable LED blinking
2008-09-13 16:43:20 -04:00
atm
removed unused #include <linux/version.h>'s
2008-08-23 12:14:12 -07:00
auxdisplay
…
base
…
block
Revert "pktcdvd: push BKL down into driver"
2008-08-27 13:42:00 -07:00
bluetooth
…
cdrom
…
char
Merge branch 'master' into next
2008-09-21 17:41:56 -07:00
clocksource
clocksource, acpi_pm.c: fix check for monotonicity
2008-09-11 11:14:29 +02:00
connector
…
cpufreq
…
cpuidle
…
crypto
crypto: talitos - Avoid consecutive packets going out with same IV
2008-09-14 13:41:19 -07:00
dca
…
dio
…
dma
…
edac
removed unused #include <linux/version.h>'s
2008-08-23 12:14:12 -07:00
eisa
…
firewire
…
firmware
ibft: fix target info parsing in ibft module
2008-09-02 19:21:40 -07:00
gpio
…
gpu
drm/radeon: downgrade debug message from info to debug.
2008-09-01 08:51:52 +10:00
hid
…
hwmon
hwmon: (ad7414) Make ad7414_update_device() static
2008-09-20 10:25:20 +02:00
i2c
Merge branch 'sh/for-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
2008-09-05 14:30:58 -07:00
ide
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
2008-09-11 08:42:55 -07:00
ieee1394
…
infiniband
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
2008-09-19 16:18:21 -07:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2008-09-06 21:47:30 -07:00
isdn
…
leds
…
lguest
lguest: update commentry
2008-08-26 00:19:28 +10:00
macintosh
…
mca
…
md
md: Don't wait UNINTERRUPTIBLE for other resync to finish
2008-09-19 11:49:54 +10:00
media
VIDEO_SH_MOBILE_CEU should depend on HAS_DMA
2008-09-10 14:15:29 -07:00
memstick
memstick: fix MSProHG 8-bit interface mode support
2008-09-13 14:41:52 -07:00
message
…
mfd
removed unused #include <linux/version.h>'s
2008-08-23 12:14:12 -07:00
misc
ia64: fix panic during `modprobe -r xpc'
2008-09-13 14:41:52 -07:00
mmc
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
2008-09-21 12:38:45 -07:00
mtd
[MTD] [NAND] tmio_nand: fix base address programming
2008-09-05 15:34:35 +01:00
net
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
2008-09-19 16:18:21 -07:00
nubus
…
of
…
oprofile
powerpc/cell/oprofile: Avoid double vfree of profile buffer
2008-08-26 10:24:46 +10:00
parisc
…
parport
…
pci
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2008-09-13 14:47:33 -07:00
pcmcia
[ARM] 5245/1: Fix warning about unused return value in drivers/pcmcia
2008-09-13 20:07:42 +01:00
pnp
PNPACPI: ignore the producer/consumer bit for extended IRQ descriptors
2008-08-25 12:04:44 +02:00
power
…
ps3
…
rapidio
…
regulator
…
rtc
rtc-cmos: wake again from S5
2008-09-02 19:21:40 -07:00
s390
[S390] cio: fix orb initialization in cio_start_key
2008-09-16 09:34:32 -07:00
sbus
…
scsi
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
2008-09-11 08:42:55 -07:00
serial
Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6.git
2008-09-13 20:11:15 +01:00
sh
…
sn
…
spi
spi_s3c24xx: fix section warning
2008-09-13 14:41:52 -07:00
ssb
…
tc
…
telephony
…
thermal
…
uio
…
usb
Merge master.kernel.org:/home/rmk/linux-2.6-arm
2008-09-08 15:50:19 -07:00
video
atmel_lcdfb: disable LCD and DMA engines when suspending
2008-09-13 14:41:52 -07:00
virtio
virtio_balloon: fix towards_target when deflating balloon
2008-08-26 00:19:25 +10:00
w1
…
watchdog
[WATCHDOG] removed unused #include <version.h>
2008-08-26 20:32:02 +00:00
xen
xen: fix 2.6.27-rc5 xen balloon driver warnings
2008-09-08 20:21:15 +02:00
zorro
…
Kconfig
…
Makefile
…