github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
7cd3739f32
linux/drivers
History
黄涛 7cd3739f32 Merge remote-tracking branch 'linux-2.6.32.y/master' into develop 
Merge Linux 2.6.32.41
Conflicts:
	Makefile
	drivers/mmc/core/core.c
	drivers/net/wireless/ath/ath9k/ath9k.h
	drivers/net/wireless/ath/ath9k/hw.c
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/ath/regd_common.h
	drivers/net/wireless/b43/dma.c
	drivers/net/wireless/b43/dma.h
	drivers/net/wireless/b43/sdio.c
	drivers/net/wireless/hostap/hostap_cs.c
	drivers/net/wireless/iwlwifi/iwl-5000.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-helpers.h
	drivers/net/wireless/iwlwifi/iwl-tx.c
	drivers/net/wireless/libertas/cmd.c
	drivers/net/wireless/p54/p54pci.c
	drivers/net/wireless/p54/p54usb.c
	drivers/net/wireless/p54/txrx.c
	drivers/net/wireless/rt2x00/rt2400pci.c
	drivers/net/wireless/rt2x00/rt2500pci.c
	drivers/net/wireless/rt2x00/rt2500usb.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/rt2x00/rt2x00.h
	drivers/net/wireless/rt2x00/rt2x00dev.c
	drivers/net/wireless/rt2x00/rt2x00queue.c
	drivers/net/wireless/rt2x00/rt61pci.c
	drivers/net/wireless/rt2x00/rt73usb.c
	drivers/usb/serial/option.c
	mm/shmem.c
2011-06-16 11:56:59 +08:00
..
accessibility
acpi ACPI: EC: Add another dmi match entry for MSI hardware 2011-01-07 14:43:07 -08:00
adc update adc driver modify 'sync_read bug' 2011-03-22 08:46:37 +08:00
amba
ata libata: set queue DMA alignment to sector size for ATAPI too 2011-05-09 15:55:41 -07:00
atm atm/solos-pci: Don't include frame pseudo-header on transmit hex-dump 2011-04-14 16:53:44 -07:00
auxdisplay
base rk29: call resume_console while dpm_drv_timeout, make debug more easy 2011-03-26 12:08:56 +08:00
block cciss: fix lost command issue 2011-04-14 16:53:18 -07:00
bluetooth Merge remote-tracking branch 'linux-2.6.32.y/master' into develop 2011-06-16 11:56:59 +08:00
cdrom
char Merge remote-tracking branch 'linux-2.6.32.y/master' into develop 2011-06-16 11:56:59 +08:00
clocksource clocksource: sh_tmu: compute mult and shift before registration 2010-09-26 17:21:37 -07:00
cmmb add cmmb io init interface in board file. 2010-10-08 17:49:02 +08:00
connector
cpufreq cpufreq: ondemand: rk29 up threshold set to 80 2011-02-22 17:30:35 +08:00
cpuidle
crypto crypto: padlock - Fix AES-CBC handling on odd-block-sized input 2010-12-09 13:27:10 -08:00
dbg restore default value to register when reboot 2011-03-21 17:02:51 +08:00
dca
dio
dma mv_xor: fix race in tasklet function 2011-01-07 14:43:17 -08:00
edac amd64_edac: Fix interleaving check 2011-01-07 14:43:06 -08:00
eisa
firewire firewire: ohci: fix race in AR split packet handling 2010-12-09 13:26:50 -08:00
firmware dcdbas: force SMI to happen when expected 2011-03-27 11:30:51 -07:00
fpga delete some invalid code in spi_i2c.c 2010-10-15 10:44:37 +08:00
gpio 添加wm8994驱动支持 2011-03-04 14:31:56 +08:00
gpu drm/radeon/kms: fix bad shift in atom iio table parser 2011-05-09 15:54:47 -07:00
headset_observe change wm831x irq base 2011-05-20 17:02:56 +08:00
hid HID: add MacBookAir 3,1 and 3,2 support 2011-05-09 15:55:37 -07:00
hwmon Merge remote-tracking branch 'linux-2.6.32.y/master' into develop 2011-06-16 11:56:59 +08:00
i2c Merge remote-tracking branch 'linux-2.6.32.y/master' into develop 2011-06-16 11:56:59 +08:00
ide ide-cd: Do not access completed requests in the irq handler 2010-08-13 13:19:36 -07:00
idle
ieee1394
ieee802154
infiniband IB/cm: Bump reference count on cm_id before invoking callback 2011-03-23 13:16:43 -07:00
input Merge remote-tracking branch 'linux-2.6.32.y/master' into develop 2011-06-16 11:56:59 +08:00
isdn isdn: avoid calling tty_ldisc_flush() in atomic context 2011-03-23 13:16:55 -07:00
leds leds : add support att1272 white led driver for camera flash led 2011-03-12 00:25:16 +08:00
lguest
macintosh
mca
md md: correctly handle probe of an 'mdp' device. 2011-03-02 09:47:05 -05:00
media Merge remote-tracking branch 'linux-2.6.32.y/master' into develop 2011-06-16 11:56:59 +08:00
memstick memstick: fix hangs on unexpected device removal in mspro_blk 2010-08-26 16:41:32 -07:00
message mptfusion: Fix Incorrect return value in mptscsih_dev_reset 2011-03-02 09:46:33 -05:00
mfd Merge remote-tracking branch 'linux-2.6.32.y/master' into develop 2011-06-16 11:56:59 +08:00
misc Merge remote-tracking branch 'linux-2.6.32.y/master' into develop 2011-06-16 11:56:59 +08:00
mmc Merge remote-tracking branch 'linux-2.6.32.y/master' into develop 2011-06-16 11:56:59 +08:00
mtd Merge remote-tracking branch 'linux-2.6.32.y/master' into develop 2011-06-16 11:56:59 +08:00
net Merge remote-tracking branch 'linux-2.6.32.y/master' into develop 2011-06-16 11:56:59 +08:00
nubus
of
oprofile oprofile: fix crash when accessing freed task structs 2010-09-20 13:17:50 -07:00
parisc
parport
pci intel-iommu: Force-disable IOMMU for iGFX on broken Cantiga revisions. 2011-05-09 15:55:37 -07:00
pcmcia pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq 2010-08-26 16:41:53 -07:00
platform dell-laptop: Add another Dell laptop family to the DMI whitelist 2011-05-09 15:55:34 -07:00
pnp
power Merge remote-tracking branch 'linux-2.6.32.y/master' into develop 2011-06-16 11:56:59 +08:00
pps
ps3
rapidio
regulator A22 and phonesdk: make wm831x enter sleep in suspend, change vdd voltage to 1.0V 2011-06-14 15:22:04 +08:00
rtc Merge remote-tracking branch 'linux-2.6.32.y/master' into develop 2011-06-16 11:56:59 +08:00
s390 dasd: correct device table 2011-05-09 15:54:50 -07:00
sbus
scsi megaraid_sas: Sanity check user supplied length before passing it to dma_alloc_coherent() 2011-05-23 11:20:26 -07:00
serial Merge remote-tracking branch 'linux-2.6.32.y/master' into develop 2011-06-16 11:56:59 +08:00
sfi
sh
sn
spi improve spi lock for lcd 2011-06-01 18:47:40 -07:00
ssb ssb: b43-pci-bridge: Add new vendor for BCM4318 2010-12-09 13:26:41 -08:00
staging Merge remote-tracking branch 'linux-2.6.32.y/master' into develop 2011-06-16 11:56:59 +08:00
switch
tc
telephony
testcode add some auto test code, maybe useful for someone 2011-06-01 18:47:40 -07:00
thermal
uio
usb Merge remote-tracking branch 'linux-2.6.32.y/master' into develop 2011-06-16 11:56:59 +08:00
uwb
video Merge remote-tracking branch 'linux-2.6.32.y/master' into develop 2011-06-16 11:56:59 +08:00
virtio virtio: set pci bus master enable bit 2011-03-07 15:17:55 -08:00
vlynq
w1 Merge remote branch 'linux-2.6.32.y/master' into develop 2010-12-16 20:54:24 +08:00
watchdog move wm831x code from rk2818 2011-02-26 14:30:08 +08:00
xen xen: ensure that all event channels start off bound to VCPU 0 2010-12-09 13:26:42 -08:00
zorro
Kconfig add some auto test code, maybe useful for someone 2011-06-01 18:47:40 -07:00
Makefile add some auto test code, maybe useful for someone 2011-06-01 18:47:40 -07:00