shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 04:48:04 +09:00
Code Issues Packages Projects Releases Wiki Activity
Files
ff98190af1ae3f8206ba86746fbe51d9b60d1b63
linux/drivers
History
黄涛 4b19ba3477 Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next 
Conflicts:
	drivers/staging/android/ion/ion.c
	include/linux/rockchip/sysmmu.h
2014-08-04 16:52:07 +08:00
..
accessibility
…
acpi
Merge tag 'lsk-android-14.04' into develop-3.10
2014-04-24 19:04:10 +08:00
adc
…
amba
PM / Runtime: Rework the "runtime idle" helper routine
2014-03-07 12:52:24 +08:00
ata
Merge tag 'lsk-android-14.05' into develop-3.10
2014-06-12 21:04:26 +08:00
atm
atm: idt77252: fix dev refcnt leak
2013-12-08 07:29:25 -08:00
auxdisplay
…
base
Revert "rk: cma: attempt to allocate same range memory while cma allocation failure"
2014-07-31 17:54:27 +08:00
bcma
…
block
floppy: don't write kernel-only members to FDRAWCMD ioctl output
2014-05-13 13:59:40 +02:00
bluetooth
…
bus
ARM: cci driver need big endian fixes in asm code
2014-03-13 14:49:52 -07:00
cdrom
…
char
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
2014-05-07 09:50:19 +01:00
cir
…
clk
rk312x:clk:support clk pd,set cpll for any freq
2014-08-01 10:48:01 +08:00
clocksource
Merge tag 'lsk-android-14.05' into develop-3.10
2014-06-12 21:04:26 +08:00
cmmb
…
connector
connector: improved unaligned access error fix
2013-12-08 07:29:25 -08:00
cpufreq
cpufreq: rockchip-cpufreq: add ARM_ROCKCHIP_CPUFREQ config
2014-07-10 14:32:57 +08:00
cpuidle
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
2014-04-15 09:59:04 +08:00
crypto
…
dca
…
devfreq
…
dio
…
dma
pl330 : fix ifdef error
2014-06-10 09:42:08 +08:00
edac
i7300_edac: Fix device reference count
2014-03-06 21:30:13 -08:00
eisa
Revert "EISA: Initialize device before its resources"
2014-02-13 13:47:59 -08:00
extcon
extcon: adc-jack: Use power efficient workqueue
2013-12-17 21:34:13 +00:00
firewire
firewire: don't use PREPARE_DELAYED_WORK
2014-03-23 21:38:16 -07:00
firmware
…
gator
gator: Version 5.18
2014-04-10 12:11:17 +01:00
gpio
Merge tag 'lsk-android-14.05' into develop-3.10
2014-06-12 21:04:26 +08:00
gpu
Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
2014-08-04 16:52:07 +08:00
headset_observe
audio:fix some compile log
2014-06-13 21:15:44 +08:00
hid
Merge tag 'lsk-android-14.05' into develop-3.10
2014-06-12 21:04:26 +08:00
hsi
…
hv
Drivers: hv: vmbus: Don't timeout during the initial connection with host
2014-02-22 12:41:28 -08:00
hwmon
rk3288:tsadc:slove pull down power_hold when power on
2014-07-09 15:16:58 +08:00
hwspinlock
…
i2c
i2c: rockchip: fix using smp_processor_id() in preemptible warning
2014-06-13 15:25:29 +08:00
ide
…
idle
x86 idle: Repair large-server 50-watt idle-power regression
2014-01-09 12:24:21 -08:00
iio
312x: adc is 4 channels
2014-07-21 15:18:55 +08:00
infiniband
iser-target: Add missing se_cmd put for WRITE_PENDING in tx_comp_err
2014-05-13 13:59:40 +02:00
input
TP: add 312x sdk TP
2014-07-30 08:44:12 +08:00
iommu
rockchip:iommu:1,fix build error 2,disable invalid tlb when iovmm_unmap
2014-07-31 17:35:15 +08:00
ipack
…
irqchip
Merge tag 'lsk-android-14.03' into develop-3.10
2014-04-15 12:51:10 +08:00
isdn
isdnloop: several buffer overflows
2014-04-14 06:42:18 -07:00
leds
…
lguest
…
macintosh
…
mailbox
…
md
dm thin: fix dangling bio in process_deferred_bios error path
2014-05-13 13:59:46 +02:00
media
camsys_drv : v0.0x12.0 ,camsys_head : v0.0x8.0
2014-07-31 18:01:30 +08:00
memory
…
memstick
…
message
…
mfd
pmic: rk818: modify shutdown function and fix compile errors
2014-07-25 16:23:54 +08:00
misc
inv_mpu: only setup timer once.
2014-08-04 09:06:22 +08:00
mmc
mmc: rk_sdmmc: increase max_blk_count for edmac
2014-08-01 17:02:51 +08:00
mtd
Merge tag 'lsk-android-14.05' into develop-3.10
2014-06-12 21:04:26 +08:00
mtk_wcn_bt
…
mtk_wcn_combo
…
net
Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
2014-07-28 16:09:07 +08:00
nfc
NFC: Add to support ap6441 & ap6493 nfc function.
2014-06-11 09:14:43 +08:00
ntb
…
nubus
…
of
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
2014-05-18 18:46:41 +01:00
oprofile
…
parisc
…
parport
parport: parport_pc: remove double PCI ID for NetMos
2014-02-06 11:08:15 -08:00
pci
Merge tag 'lsk-android-14.04' into develop-3.10
2014-04-24 19:04:10 +08:00
pcmcia
…
pinctrl
pinctrl:fix debug command bug for rk3036/rk312x
2014-08-04 09:51:47 +08:00
platform
hp_accel: Add a new PnP ID HPQ6007 for new HP laptops
2014-02-06 11:08:16 -08:00
pnp
PNP / ACPI: proper handling of ACPI IO/Memory resource parsing failures
2014-03-23 21:38:22 -07:00
power
rk312x: add rk818-battery
2014-07-30 20:04:14 +08:00
pps
…
ps3
…
ptp
…
pwm
pwm: rockchip: fix lock warning
2014-05-07 19:47:44 +08:00
rapidio
rapidio/tsi721: fix tasklet termination in dma channel release
2014-03-23 21:38:09 -07:00
regulator
rockchip: dvfs: switch regulator mode dynamically as rate changes
2014-07-07 20:13:24 +08:00
remoteproc
…
reset
reset: rockchip: fix compilation warning
2014-07-02 19:58:15 +08:00
rpmsg
…
rtc
Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
2014-07-28 16:09:07 +08:00
s390
s390/chsc: fix SEI usage on old FW levels
2014-05-13 13:59:42 +02:00
sbus
…
scsi
Merge tag 'lsk-android-14.05' into develop-3.10
2014-06-12 21:04:26 +08:00
sfi
…
sh
PM / Runtime: Rework the "runtime idle" helper routine
2014-03-07 12:52:24 +08:00
smc
…
sn
…
spi
spi:fix the bug while read one byte
2014-08-04 13:47:27 +08:00
ssb
…
ssbi
…
staging
Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
2014-08-04 16:52:07 +08:00
switch
…
target
target/tcm_fc: Fix use-after-free of ft_tpg
2014-05-06 07:55:30 -07:00
tc
…
testcode
…
thermal
thermal: debug: add debug statement for core and step_wise
2014-03-31 15:47:21 +08:00
tty
Merge tag 'lsk-android-14.05' into develop-3.10
2014-06-12 21:04:26 +08:00
uio
…
usb
Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
2014-08-04 16:52:07 +08:00
uwb
…
vfio
mm: close PageTail race
2014-04-03 12:01:05 -07:00
vhost
vhost: validate vhost_get_vq_desc return value
2014-04-14 06:42:18 -07:00
video
rk312x lvds: fix no display
2014-08-04 11:56:04 +08:00
virt
…
virtio
virtio_balloon: don't softlockup on huge balloon changes.
2014-05-13 13:59:41 +02:00
vlynq
…
vme
VME: Correct read/write alignment algorithm
2014-02-22 12:41:28 -08:00
w1
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
2014-05-07 09:50:19 +01:00
watchdog
rk3288: add watchdot support
2014-03-27 19:37:35 -07:00
xen
xen/gnttab: leave lazy MMU mode in the case of a m2p override failure
2013-12-11 22:36:27 -08:00
zorro
…
Kconfig
gator: Add config for building the module in-tree
2014-04-10 12:34:14 +01:00
Makefile
gator: Add config for building the module in-tree
2014-04-10 12:34:14 +01:00