Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-16 01:54:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux/drivers
History
Linus Torvalds 26e9a39777 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (25 commits)
  staging: at76_usb wireless driver
  Staging: workaround build system bug
  Staging: Lindent sxg.c
  Staging: SLICOSS: Call pci_release_regions at driver exit
  Staging: SLICOSS: Fix remaining type names
  Staging: SLICOSS: Fix warnings due to static usage
  Staging: SLICOSS: lots of checkpatch fixes
  Staging: go7007 v4l fixes
  Staging: Fix gcc warnings in sxg
  Staging: add echo cancelation module
  Staging: add wlan-ng prism2 usb driver
  Staging: add w35und wifi driver
  Staging: USB/IP: add host driver
  Staging: USB/IP: add client driver
  Staging: USB/IP: add common functions needed
  Staging: add the go7007 video driver
  Staging: add me4000 pci data collection driver
  Staging: add me4000 firmware files
  Staging: add sxg network driver
  Staging: add Alacritech slicoss network driver
  ...

Fixed up conflicts due to taint flags changes and MAINTAINERS cleanup in
MAINTAINERS, include/linux/kernel.h and kernel/panic.c.
2008-10-17 09:50:12 -07:00
..
accessibility
braille_console: only register notifiers when the braille console is used
2008-10-02 15:53:13 -07:00
acpi
rtc-cmos: move wake setup from ACPI glue into RTC driver
2008-10-14 16:08:21 -07:00
amba
…
ata
Merge commit 'origin'
2008-10-15 11:31:54 +11:00
atm
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2008-10-11 12:39:35 -07:00
auxdisplay
…
base
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2008-10-16 12:40:26 -07:00
block
device create: block: convert device_create_drvdata to device_create
2008-10-16 09:24:41 -07:00
bluetooth
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2008-10-13 14:12:40 -07:00
cdrom
gdrom: change to use __blk_end_request()
2008-10-09 08:56:21 +02:00
char
Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6
2008-10-16 12:43:49 -07:00
clocksource
clocksource, acpi_pm.c: fix check for monotonicity
2008-09-11 11:14:29 +02:00
connector
…
cpufreq
[CPUFREQ] Fix BUG: using smp_processor_id() in preemptible code
2008-10-09 13:52:44 -04:00
cpuidle
cpuidle: Make ladder governor honor latency requirements fully
2008-08-15 21:25:35 +02:00
crypto
crypto: talitos - Avoid consecutive packets going out with same IV
2008-09-14 13:41:19 -07:00
dca
device create: misc: convert device_create_drvdata to device_create
2008-10-16 09:24:43 -07:00
dio
…
dma
dw_dmac: fix copy/paste bug in tasklet
2008-10-03 18:22:18 -07:00
edac
edac i5000: fix thermal issues
2008-10-16 11:21:48 -07:00
eisa
…
firewire
firewire: fix ioctl() return code
2008-10-15 22:21:10 +02:00
firmware
Merge branch 'core-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2008-10-16 15:17:40 -07:00
gpio
gpiolib: request/free hooks
2008-10-16 11:21:40 -07:00
gpu
misc: replace __FUNCTION__ with __func__
2008-10-16 11:21:30 -07:00
hid
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2008-10-16 12:40:26 -07:00
hwmon
hwmon: (adm1026) Prevent log spamming
2008-10-17 17:51:20 +02:00
i2c
hwmon: (ams) Convert to a new-style i2c driver
2008-10-17 17:51:12 +02:00
ide
block: remove __generic_unplug_device() from exports
2008-10-17 14:03:08 +02:00
ieee1394
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
2008-10-16 15:02:24 -07:00
infiniband
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2008-10-17 09:00:23 -07:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2008-10-16 11:52:08 -07:00
isdn
device create: misc: convert device_create_drvdata to device_create
2008-10-16 09:24:43 -07:00
leds
device create: misc: convert device_create_drvdata to device_create
2008-10-16 09:24:43 -07:00
lguest
lguest: update commentry
2008-08-26 00:19:28 +10:00
macintosh
device create: misc: convert device_create_drvdata to device_create
2008-10-16 09:24:43 -07:00
mca
…
md
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2008-10-17 09:00:23 -07:00
media
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2008-10-16 12:40:26 -07:00
memstick
memstick: change to use __blk_end_request()
2008-10-09 08:56:20 +02:00
message
i2o: Fix 32/64bit DMA locking
2008-10-16 11:21:38 -07:00
mfd
Merge branch 's3c-move' into devel
2008-10-14 22:24:51 +01:00
misc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2008-10-16 12:40:26 -07:00
mmc
Merge branch 'fixes' into for-linus
2008-10-15 23:16:07 +01:00
mtd
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2008-10-16 12:40:26 -07:00
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2008-10-17 08:58:52 -07:00
nubus
nubus: fix mis-indented statement
2008-10-16 11:21:30 -07:00
of
Merge commit 'gcl/gcl-next'
2008-10-14 10:11:27 +11:00
oprofile
Merge branch 'linus' into oprofile-v2
2008-10-13 11:05:51 +02:00
parisc
…
parport
parport: remove CVS keywords
2008-10-16 11:21:49 -07:00
pci
{pci,pnp} quirks.c: don't use deprecated print_fn_descriptor_symbol()
2008-10-16 16:11:43 -07:00
pcmcia
[ARM] 5307/1: pxa: fix CM-X2XX PCMCIA build error
2008-10-15 12:34:50 +01:00
pnp
{pci,pnp} quirks.c: don't use deprecated print_fn_descriptor_symbol()
2008-10-16 16:11:43 -07:00
power
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2008-10-16 12:40:26 -07:00
ps3
…
rapidio
…
regulator
da903x: add regulator support for DA9030/DA9034
2008-10-13 21:51:57 +01:00
rtc
rtc: rtc-ds1286 and rtc-m48t35 need <linux/io.h>
2008-10-16 11:32:38 -07:00
s390
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
2008-10-17 09:29:55 -07:00
sbus
sparc: Kill sbus mostek RTC driver.
2008-09-03 15:55:32 -07:00
scsi
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2008-10-17 09:00:23 -07:00
serial
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
2008-10-16 11:25:32 -07:00
sh
sh: Fix up broken kerneldoc comments.
2008-08-04 12:51:06 +09:00
sn
…
spi
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2008-10-16 12:40:26 -07:00
ssb
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2008-10-13 14:12:40 -07:00
staging
staging: at76_usb wireless driver
2008-10-13 14:33:13 -07:00
tc
…
telephony
telephony: remove CVS keywords
2008-10-16 11:21:45 -07:00
thermal
…
uio
UIO: Fix mapping of logical and virtual memory
2008-10-16 09:24:54 -07:00
usb
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2008-10-16 12:40:26 -07:00
video
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2008-10-16 12:40:26 -07:00
virtio
virtio_balloon: fix towards_target when deflating balloon
2008-08-26 00:19:25 +10:00
w1
w1: new driver. DS2431 chip
2008-10-16 11:21:51 -07:00
watchdog
Merge branch 's3c-move' into devel
2008-10-14 22:24:51 +01:00
xen
xen: remove unused balloon.h
2008-10-03 10:04:10 +02:00
zorro
…
Kconfig
Staging: add Kconfig entries and Makefile infrastructure
2008-10-10 15:31:06 -07:00
Makefile
Staging: add Kconfig entries and Makefile infrastructure
2008-10-10 15:31:06 -07:00