shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-04-15 01:50:40 +09:00
Code Issues Packages Projects Releases Wiki Activity
Files
b2be450f10a186dbddc94f2ecc8209641bc42cc6
linux/drivers
History
黄涛 b2be450f10 Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb 
Conflicts:
	include/net/cfg80211.h
2012-08-21 14:14:24 +08:00
..
accessibility
…
acpi
ACPI/AC: prevent OOPS on some boxes due to missing check power_supply_register() return value check
2012-08-09 08:27:42 -07:00
adc
Merge remote-tracking branch 'origin/develop-3.0-rk2928' into develop-3.0
2012-08-17 21:48:20 +08:00
amba
ARM: 6829/1: amba: make hardcoded periphid override hardware
2011-05-26 10:33:34 +01:00
ata
ahci: Detect Marvell 88SE9172 SATA controller
2012-06-01 15:12:55 +08:00
atm
solos-pci: Fix DMA support
2012-06-10 00:32:58 +09:00
auxdisplay
…
base
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb
2012-08-21 13:11:48 +08:00
bcma
drivers/bcma/host_pci.c needs slab.h
2011-05-26 17:12:32 -07:00
block
umem: fix up unplugging
2012-07-16 08:47:51 -07:00
bluetooth
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
2012-08-21 14:14:24 +08:00
cdrom
cdrom: use copy_to_user() without the underscores
2012-02-29 16:34:35 -08:00
char
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb
2012-08-21 13:11:48 +08:00
cir
add lock between cir and irda
2011-09-02 17:48:00 +08:00
clk
…
clocksource
Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"
2011-07-30 16:24:52 +08:00
cmmb
CTS : fix cmmb permission
2012-03-26 15:56:57 +08:00
connector
Revert "Merge commit 'v2.6.32.9' into android-2.6.32"
2011-07-30 22:24:29 +08:00
cpufreq
rk: cpufreq: interactive: revert "apply intermediate load to max speed not current"
2012-07-26 17:33:58 +08:00
cpuidle
cpuidle: governor: menu: don't use loadavg
2011-09-19 16:56:40 -07:00
crypto
crypto: mv_cesa requires on CRYPTO_HASH to build
2012-05-21 09:40:03 -07:00
dbg
dbg: fix for v2.6.36
2011-08-01 11:21:06 +08:00
dca
…
dio
…
dma
dmaengine: at_hdmac: remove clear-on-read in atc_dostart()
2012-05-07 08:56:33 -07:00
edac
x86: Simplify code by removing a !SMP #ifdefs from 'struct cpuinfo_x86'
2012-08-15 12:04:09 -07:00
eisa
…
firewire
firewire: ohci: fix too-early completion of IR multichannel buffers
2012-04-02 09:27:13 -07:00
firmware
dmi: Feed DMI table to /dev/random driver
2012-08-15 12:04:29 -07:00
gpio
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
2012-08-21 14:14:24 +08:00
gpu
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb
2012-08-21 13:11:48 +08:00
headset_observe
rk30 phone: modify headset detect request irq location
2012-06-03 16:38:27 +08:00
hid
Merge remote-tracking branch 'common/android-3.0' into develop-3.0-jb
2012-07-12 18:08:01 +08:00
hwmon
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb
2012-08-21 13:11:48 +08:00
hwspinlock
hwspinlock/core: use a mutex to protect the radix tree
2011-11-11 09:36:31 -08:00
i2c
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
2012-08-21 14:14:24 +08:00
ide
block: add and use scsi_blk_cmd_ioctl
2012-01-25 17:24:54 -08:00
idle
intel_idle: fix API misuse
2012-01-25 17:24:56 -08:00
ieee802154
…
infiniband
RDMA/cxgb4: Drop peer_abort when no endpoint found
2012-06-01 15:12:54 +08:00
input
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
2012-08-21 14:14:24 +08:00
isdn
isdn/gigaset: ratelimit CAPI message dumps
2012-06-01 15:12:53 +08:00
leds
Merge remote-tracking branch 'common/android-3.0' into develop-3.0-jb
2012-07-12 18:08:01 +08:00
lguest
Revert "Merge commit 'v2.6.32.9' into android-2.6.32"
2011-07-30 22:24:29 +08:00
macintosh
Revert "Merge commit 'v2.6.32.9' into android-2.6.32"
2011-07-30 22:24:29 +08:00
mca
…
md
dm raid1: fix crash with mirror recovery and discard
2012-08-01 12:26:54 -07:00
media
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
2012-08-21 14:14:24 +08:00
memstick
Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"
2011-07-30 16:24:52 +08:00
message
Revert "Merge commit 'v2.6.32.9' into android-2.6.32"
2011-07-30 22:24:29 +08:00
mfd
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
2012-08-21 14:14:24 +08:00
misc
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
2012-08-21 14:14:24 +08:00
mmc
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
2012-08-21 14:14:24 +08:00
mtd
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
2012-08-21 14:14:24 +08:00
mtk_wcn_combo
add MTK-combo-module,continue with commit 17f39ed917
2012-08-10 14:27:55 +08:00
net
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
2012-08-21 14:14:24 +08:00
nfc
…
nubus
…
of
Merge branch 'devicetree/arm-next' of git://git.secretlab.ca/git/linux-2.6 into devel-stable
2011-05-25 00:08:17 +01:00
oprofile
oprofile: perf: use NR_CPUS instead or nr_cpumask_bits for static array
2012-07-16 08:47:48 -07:00
parisc
Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"
2011-07-30 16:24:52 +08:00
parport
Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
2011-05-26 13:19:00 -07:00
pci
PCI: EHCI: fix crash during suspend on ASUS computers
2012-07-16 08:47:50 -07:00
pcmcia
pcmcia: fix socket refcount decrementing on each resume
2012-02-13 11:06:10 -08:00
platform
intel_ips: blacklist HP ProBook laptops
2012-07-19 08:58:21 -07:00
pnp
PNPACPI: Fix device ref leaking in acpi_pnp_match
2012-04-13 08:14:05 -07:00
power
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
2012-08-21 14:14:24 +08:00
pps
…
ps3
…
ptp
ptp: Fix clock_getres() implementation
2011-12-21 12:57:36 -08:00
rapidio
rapidio: fix use of non-compatible registers
2011-10-03 11:39:46 -07:00
regulator
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
2012-08-21 14:14:24 +08:00
rtc
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
2012-08-21 14:14:24 +08:00
s390
compat: Re-add missing asm/compat.h include to fix compile breakage on s390
2012-03-19 08:57:59 -07:00
sbus
…
scsi
SCSI: Avoid dangling pointer in scsi_requeue_command()
2012-08-09 08:27:34 -07:00
sfi
…
sh
drivers: sh: resume enabled clocks fix
2011-06-14 15:15:25 +09:00
smc
newton: improve smc drivers
2011-09-13 21:12:50 -07:00
sn
…
spi
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
2012-08-21 14:14:24 +08:00
ssb
ssb: fix init regression with SoCs
2012-01-06 14:13:48 -08:00
staging
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb
2012-07-12 18:46:41 +08:00
switch
switch: add timestamps to switch driver
2012-04-02 16:33:57 -07:00
target
tcm_fc: Resolve suspicious RCU usage warnings
2012-07-16 08:47:49 -07:00
tc
…
telephony
…
testcode
add some auto test code, maybe useful for someone
2011-06-01 18:47:40 -07:00
thermal
…
tty
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
2012-08-21 14:14:24 +08:00
uio
…
usb
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
2012-08-21 14:14:24 +08:00
uwb
uwb: fix error handling
2012-04-27 09:51:06 -07:00
vhost
vhost: don't forget to schedule()
2012-07-16 08:47:51 -07:00
video
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
2012-08-21 14:14:24 +08:00
virtio
virtio-pci: fix use after free
2011-11-21 14:31:14 -08:00
vlynq
…
w1
drivers/power/ds2780_battery.c: add a nolock function to w1 interface
2011-11-11 09:36:32 -08:00
watchdog
Merge remote-tracking branch 'common/android-3.0' into develop-3.0-jb
2012-07-12 18:08:01 +08:00
xen
xen/xenbus: Add quirk to deal with misconfigured backends.
2012-04-27 09:51:05 -07:00
zorro
zorro: Defer device_register() until all devices have been identified
2011-10-03 11:40:57 -07:00
Kconfig
add MTK-combo-module
2012-08-10 14:02:20 +08:00
Makefile
add MTK-combo-module
2012-08-10 14:02:20 +08:00