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
268,317 Commits 1 Branch 934 Tags 20 GiB
b2be450f10
Commit Graph

268317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
黄涛
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
黄涛
109b0ba094 Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb 
Conflicts:
	Makefile
	drivers/net/tun.c
	drivers/net/wireless/rt2x00/rt61pci.c
	drivers/usb/core/hub.c
	sound/soc/codecs/wm8994.c
 2012-08-21 13:11:48 +08:00
张晴
beb9e50ebc rk2928:sdk and a720:support pmu sleep 2012-08-21 12:04:40 +08:00
黄涛
64fdea83d9 logo: bmp: default n 2012-08-21 11:57:50 +08:00
lw
ca6be0fe22 phonepad:add touch screen Kconfig again 2012-08-21 11:51:35 +08:00
许盛飞
55a4cbf7c8 rk30: rm the sram_printch(8) 2012-08-21 11:23:00 +08:00
许盛飞
42205e9579 slove the bug -- support gpio3 and gpio4 interrupt wake up sysytem 2012-08-21 11:13:44 +08:00
Zheng Yang
f2428c1dff rk2928: acodec: move audio codec platform device registration to board file to configure speaker control pin. 2012-08-21 09:50:46 +08:00
黄涛
ebfe38927f rk: usb_detect: mark board_usb_detect_init as __init, use irq_set_irq_type support both edge trigger 2012-08-21 09:36:17 +08:00
黄涛
62669068b8 rk2928: usb_detect: mark bvalid_init as __init, clear bvalid irq when init 2012-08-21 09:08:41 +08:00
宋秀杰
9edeaf1839 phonepad: make rt3261 incall volume control work. 2012-08-20 22:35:49 +08:00
黄涛
ac2bc560e8 rk2928: pm: fix unable to suspend bug 2012-08-20 20:53:41 +08:00
黄涛
d663394000 rk2928: usb_detect: support bvalid irq wake up system 2012-08-20 20:52:44 +08:00
chenxing
e2c1923a25 rk2928:sdk: default disable gpio clk 2012-08-20 20:31:16 +08:00
chenxing
9704477612 rk2928:sdk: rename gpio(i) 2012-08-20 20:27:32 +08:00
chenxing
0f3b17d283 rk2928:sdk: disable unused clocks 2012-08-20 20:19:06 +08:00
chenxing
6fef705fc0 rk2928:a720: setup frequency 600M for a720 2012-08-20 20:14:33 +08:00
Zheng Yang
c9a94ee42d rk2928 codec: add speaker control. 2012-08-20 18:40:47 +08:00
hcy
0d54b690bb fix DLL off bug, fix ZQCR[1] bug, add to support change BL, add dsb() 2012-08-20 17:58:39 +08:00
xbw
7c31576136 sdmmc: some card, SDHC 32G Class10, maybe miss the nobusy_INT. so close the nobusy_INT function 2012-08-20 17:16:05 +08:00
root
82a500834e camera rk30: add scale by arm,rga and pp. 2012-08-20 16:18:30 +08:00
gwl
e85be8c2be add rtl8188eu to rkwifi_sys_iface.c 2012-08-20 14:50:02 +08:00
chenxing
ebb93cff36 rk2928:sdk: codec pll for sclk_lcdc only, aclk_vio_pre need yxj fixed, move other clks to general pll 2012-08-20 14:22:55 +08:00
kfx
d0273dd2e7 rk2928: a720: touchscren && camera && sdmmc && usb wifi support 2012-08-20 13:16:32 +08:00
ywj
33144075f1 Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0 2012-08-20 11:46:25 +08:00
ywj
6c1f418129 remove bmp_logo option and del rk29_backlight.c printklog 2012-08-20 11:40:56 +08:00
ywj
b7e358d29e amend DEVICE_ATTR 0660 of rk29_keys and rk29_backlight factorytool 2012-08-20 11:29:51 +08:00
yzq
ecf80461d2 rk2928 hdmi: remove unnecessary files and update low power mode 2012-08-20 10:29:14 +08:00
Zheng Yang
28e07bcda6 rk30 hdmi: Modify Kconfig to support hdcp. 2012-08-20 09:18:06 +08:00
lw
486c766794 sensor:mask some debug information 2012-08-19 19:48:54 +08:00
lw@rock-chips.com
1d47ad320f sensor:add setting gsensor orientation online support 2012-08-19 19:40:03 +08:00
kfx
07a6776286 rk2928: a720: cpufreq(1G) && pmic sleep io && backlight && gsensor 2012-08-19 19:11:31 +08:00
lw
f81e3371f3 rk2928 a720:add mma7660 support 2012-08-19 18:27:06 +08:00
lw
afafab1207 sensor:add gsensor mma7660 support 2012-08-19 18:17:03 +08:00
chenxing
dbe3cb9f74 rk2928:a720: fix vdd_log dvfs error 2012-08-19 15:57:41 +08:00
kfx
ebe214e010 rk2928: a720 init 2012-08-19 15:18:44 +08:00
黄涛
21d650142f Revert "add usb wifi rtl8188eus support." 
This reverts commit 1c9e908069.

Conflicts:

	drivers/net/wireless/Kconfig
	drivers/net/wireless/Makefile
	drivers/net/wireless/wifi_sys/rkwifi_sys_iface.c
 2012-08-17 22:59:47 +08:00
黄涛
e2c42c5690 rk2928: sdk: defconfig: disable bmp logo 2012-08-17 22:40:12 +08:00
黄涛
2465250f7e rk2928: devices.c: add dummy i2c check idle 2012-08-17 22:37:44 +08:00
黄涛
aea3c212d4 rk30: sdk: board-rk30-sdk.c include board-rk30-sdk-camera.c and board-rk30-sdk-key.c 2012-08-17 22:16:19 +08:00
黄涛
8bee22ca2d rk30: phonepad: fix gcc warning, "CONFIG_RK30_PWM_REGULATOR" is not defined 2012-08-17 22:08:40 +08:00
黄涛
9c60c70b72 rk30: sdk: fix gcc warning, "CONFIG_RK30_PWM_REGULATOR" is not defined 2012-08-17 22:08:24 +08:00
黄涛
6214df8abb rk2928: sdk: fix gcc warning, "CONFIG_RK30_PWM_REGULATOR" is not defined 2012-08-17 22:08:08 +08:00
黄涛
d7fb2169b6 Merge remote-tracking branch 'origin/develop-3.0-rk2928' into develop-3.0 
Conflicts:
	arch/arm/mach-rk30/include/mach/rk30_camera.h
	arch/arm/plat-rk/include/plat/rk_camera.h
	drivers/gpio/gpio-tps65910.c
	drivers/media/video/rk30_camera_oneframe.c
	drivers/mmc/host/rk29_sdmmc.c
	drivers/net/wireless/Kconfig
	drivers/net/wireless/Makefile
	drivers/net/wireless/wifi_sys/rkwifi_sys_iface.c
	drivers/regulator/rk30-pwm-regulator.c
	drivers/usb/dwc_otg/dwc_otg_driver.c
	drivers/usb/dwc_otg/dwc_otg_hcd.c
	drivers/usb/dwc_otg/dwc_otg_pcd.c
	sound/soc/codecs/Makefile
	sound/soc/rk29/Kconfig
 2012-08-17 21:48:20 +08:00
黄涛
3be93856a1 gitignore: ignore scripts/bmptologo 2012-08-17 19:20:47 +08:00
黄涛
f962867a8f bmptologo: fix gcc warning 2012-08-17 19:17:19 +08:00
ywj
f22b396074 gsensor code result in system reboot,gsensor code by lw update 2012-08-17 18:20:55 +08:00
zyc
67d9247a13 camera : support arm and rga to do digital zoom. 2012-08-17 18:01:02 +08:00
ywj
fe5f1eac21 Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0 2012-08-17 17:58:04 +08:00
ywj
8476fc265f add bmp photo for factory and del fb test log 2012-08-17 17:57:15 +08:00