firefly-linux-kernel-4.4.55.git
12 years agorkfb:modify to implement dual display on rk2928
yxj [Wed, 29 Aug 2012 05:06:18 +0000 (13:06 +0800)]
rkfb:modify to implement dual display on rk2928

12 years agork2928 lvds:select lcdc interface according to lcdc_id in screen
yxj [Wed, 29 Aug 2012 05:04:13 +0000 (13:04 +0800)]
rk2928 lvds:select lcdc interface according to lcdc_id in screen

12 years agork30 lcdc:modify debug level
yxj [Tue, 28 Aug 2012 06:37:36 +0000 (14:37 +0800)]
rk30 lcdc:modify debug level

12 years agorkhdmi:modify to compatible for platform which have only one lcdc but need to impleme...
yxj [Tue, 28 Aug 2012 06:35:39 +0000 (14:35 +0800)]
rkhdmi:modify to compatible for platform which have only one lcdc but need to implement dual display like rk2928

12 years agork30 lcdc: fix compile err
yxj [Tue, 28 Aug 2012 06:14:19 +0000 (14:14 +0800)]
rk30 lcdc: fix compile err

12 years agorkfb: select current screen in lcdc driver
yxj [Tue, 28 Aug 2012 06:13:12 +0000 (14:13 +0800)]
rkfb: select current screen in lcdc driver

12 years agork2928:add scaler register config
yxj [Thu, 9 Aug 2012 10:38:21 +0000 (18:38 +0800)]
rk2928:add scaler register config

12 years agork30 lcdc:modify to compatible for platform which have only one lcdc but need to...
yxj [Fri, 10 Aug 2012 08:26:32 +0000 (16:26 +0800)]
rk30 lcdc:modify to compatible for platform which have only one lcdc but need to implement dual display like rk2928

12 years agorkfb: modify to compatible for platform which have only one lcdc but need to implemen...
yxj [Fri, 10 Aug 2012 08:25:20 +0000 (16:25 +0800)]
rkfb: modify to compatible for platform which have only one lcdc but need to implement dual display like rk2928

12 years agorkfb:defaut use fb0
yxj [Fri, 24 Aug 2012 06:23:24 +0000 (14:23 +0800)]
rkfb:defaut use fb0

12 years agoA720 screen:invert dclk
yxj [Fri, 24 Aug 2012 06:21:13 +0000 (14:21 +0800)]
A720 screen:invert dclk

12 years agolcd b101ew05: add default lut table
yxj [Thu, 23 Aug 2012 09:45:29 +0000 (17:45 +0800)]
lcd b101ew05: add default lut table

12 years agork30 lcdc:add lut default init 、suspend and resume
yxj [Thu, 23 Aug 2012 09:44:58 +0000 (17:44 +0800)]
rk30 lcdc:add lut default init 、suspend and resume

12 years agostruct rk_screen:add dsp_lut
yxj [Thu, 23 Aug 2012 09:43:41 +0000 (17:43 +0800)]
struct rk_screen:add dsp_lut

12 years agofix bug in set_dsp_lut,only 10 words can updated by user before this bug fixed
yxj [Thu, 16 Aug 2012 01:54:03 +0000 (09:54 +0800)]
fix bug in set_dsp_lut,only 10 words can updated by user before this bug fixed

12 years agork30 lcdc:delay before wirite lut data,the reg modify only update at the start of...
yxj [Tue, 14 Aug 2012 09:47:29 +0000 (17:47 +0800)]
rk30 lcdc:delay before wirite lut data,the reg modify  only update at the start of every frame after set cfg_done reg

12 years agorkfbsys:mask printk int set_dsp_lut
yxj [Tue, 14 Aug 2012 09:44:08 +0000 (17:44 +0800)]
rkfbsys:mask printk int  set_dsp_lut

12 years agorkfbsys:fix bug in set_dsp_lut
yxj [Tue, 14 Aug 2012 03:12:33 +0000 (11:12 +0800)]
rkfbsys:fix bug in set_dsp_lut

12 years agork30 lcdc: display lut support
yxj [Sat, 11 Aug 2012 02:43:54 +0000 (10:43 +0800)]
rk30 lcdc: display lut support

12 years agorkfb:add display lut set/read interface
yxj [Sat, 11 Aug 2012 02:42:50 +0000 (10:42 +0800)]
rkfb:add display lut set/read interface

12 years agork30 lcdc: add layer remap interface
yxj [Fri, 10 Aug 2012 02:14:46 +0000 (10:14 +0800)]
rk30 lcdc: add layer remap interface

12 years agorkfb:fix rk30lcdc win2 crash
yxj [Fri, 10 Aug 2012 02:12:36 +0000 (10:12 +0800)]
rkfb:fix rk30lcdc win2 crash

12 years agork30 lcdc: win2 support
yxj [Fri, 20 Jul 2012 06:13:27 +0000 (14:13 +0800)]
rk30 lcdc: win2 support

12 years agorkfb : layer and fb map soc independently ,add sys node for fb and layer remap
yxj [Wed, 8 Aug 2012 14:19:05 +0000 (22:19 +0800)]
rkfb : layer and fb map soc independently ,add sys node for fb and layer remap

12 years agoinput: sensor-dev: todos and fix build error without earlysuspend, fix gcc warning
黄涛 [Wed, 29 Aug 2012 04:22:59 +0000 (12:22 +0800)]
input: sensor-dev: todos and fix build error without earlysuspend, fix gcc warning

12 years agork30: io: add ROM map
黄涛 [Wed, 29 Aug 2012 03:04:43 +0000 (11:04 +0800)]
rk30: io: add ROM map

12 years agork2928: touchscreen: update driver only support fw version: 7 6 6 4
kfx [Wed, 29 Aug 2012 01:03:46 +0000 (09:03 +0800)]
rk2928: touchscreen: update driver only support fw version: 7 6 6 4

12 years agork_serial:serial rx use new dma interface rk29_dma_enqueue_ring
hhb [Tue, 28 Aug 2012 08:34:02 +0000 (16:34 +0800)]
rk_serial:serial rx use new dma interface  rk29_dma_enqueue_ring

12 years agodma pl330: add dma infiniteloop transfer
hhb [Tue, 28 Aug 2012 08:33:15 +0000 (16:33 +0800)]
dma pl330: add dma infiniteloop transfer

12 years agork3066B i2s: remove rk3066B i2s2
邱建斌 [Tue, 28 Aug 2012 07:17:48 +0000 (15:17 +0800)]
rk3066B i2s: remove rk3066B i2s2

12 years agork30 and rk2928:support set logic init voltage by pwm
zq [Tue, 28 Aug 2012 04:36:17 +0000 (21:36 -0700)]
rk30 and rk2928:support set logic init voltage by pwm

12 years agoavs malloc mem when avs cmd start
xxx [Tue, 28 Aug 2012 18:08:49 +0000 (11:08 -0700)]
avs malloc mem when avs cmd start

12 years agork3066b: fix gpio usage
黄涛 [Tue, 28 Aug 2012 02:54:45 +0000 (10:54 +0800)]
rk3066b: fix gpio usage

12 years agork2928: add RK2928_GPIO0_BASE RK2928_GPIO2_BASE preread
许盛飞 [Tue, 28 Aug 2012 02:47:14 +0000 (10:47 +0800)]
rk2928: add RK2928_GPIO0_BASE RK2928_GPIO2_BASE preread

12 years agork2928: the bug of suspen , RK2928_GPIO1_BASE preread
许盛飞 [Tue, 28 Aug 2012 02:41:56 +0000 (10:41 +0800)]
rk2928: the bug of suspen , RK2928_GPIO1_BASE preread

12 years agork2928: gsensor: fix orientation
kfx [Tue, 28 Aug 2012 01:54:31 +0000 (09:54 +0800)]
rk2928: gsensor: fix orientation

12 years agork3066b: fix gpio usage
黄涛 [Tue, 28 Aug 2012 01:35:26 +0000 (09:35 +0800)]
rk3066b: fix gpio usage

12 years agork3066b: disable tsadc device register
黄涛 [Mon, 27 Aug 2012 11:40:37 +0000 (19:40 +0800)]
rk3066b: disable tsadc device register

12 years agork30: refactor wdt init code
黄涛 [Mon, 27 Aug 2012 11:27:54 +0000 (19:27 +0800)]
rk30: refactor wdt init code

12 years agowatch dog timer: add wdt platform to rk30 device.c
hhb [Mon, 27 Aug 2012 09:54:52 +0000 (17:54 +0800)]
watch dog timer: add wdt platform to rk30 device.c

12 years ago ddr_suspend remove flush_tlb_all function
hcy [Mon, 27 Aug 2012 08:37:15 +0000 (16:37 +0800)]
  ddr_suspend remove flush_tlb_all function

12 years agophonepad: rt3261 add speaker depop code.
宋秀杰 [Mon, 27 Aug 2012 06:51:16 +0000 (14:51 +0800)]
phonepad: rt3261 add speaker depop code.

12 years agohost inno phy config
yangkai [Mon, 27 Aug 2012 06:31:37 +0000 (14:31 +0800)]
host inno phy config

12 years agork2928:sdk: fix pll_mode POWER ON/DN ERROR
chenxing [Mon, 27 Aug 2012 06:08:51 +0000 (14:08 +0800)]
rk2928:sdk: fix pll_mode POWER ON/DN ERROR

12 years agork2928: apll gpll cpll powerdown
许盛飞 [Mon, 27 Aug 2012 02:20:04 +0000 (10:20 +0800)]
rk2928: apll gpll cpll powerdown

12 years agocamera rk30 : disable CIF_DO_CROP, work something wrong with rk2928 now.
root [Sat, 25 Aug 2012 09:16:55 +0000 (17:16 +0800)]
camera rk30 : disable CIF_DO_CROP, work something wrong with rk2928 now.

12 years agork30:sdk: dvfs freq limit active right now
chenxing [Sat, 25 Aug 2012 07:49:17 +0000 (15:49 +0800)]
rk30:sdk: dvfs freq limit active right now

12 years agophonepad:add pre_div parameter for backlight
lw@rock-chips.com [Sat, 25 Aug 2012 07:01:33 +0000 (15:01 +0800)]
phonepad:add pre_div parameter for backlight

12 years agork2928: a720: set min_brightness 80
kfx [Sat, 25 Aug 2012 03:59:53 +0000 (11:59 +0800)]
rk2928: a720: set min_brightness 80

12 years agobacklight:add pre_div parameter
lw@rock-chips.com [Fri, 24 Aug 2012 09:57:55 +0000 (17:57 +0800)]
backlight:add pre_div parameter

12 years agorga: fix deadlock issue between rga_power_on and rga_power_off_work
黄涛 [Fri, 24 Aug 2012 09:19:18 +0000 (17:19 +0800)]
rga: fix deadlock issue between rga_power_on and rga_power_off_work

Fix this deadlock by call mutex_trylock on rga_power_off_work:

SurfaceFlinger  D c086ec20     0   247      1 0x00000001
[<c086ec20>] (__schedule+0x6d0/0x79c) from [<c086f110>] (schedule_timeout+0x1c/0x208)
[<c086f110>] (schedule_timeout+0x1c/0x208) from [<c086e36c>] (wait_for_common+0xdc/0x178)
[<c086e36c>] (wait_for_common+0xdc/0x178) from [<c04773b8>] (wait_on_work+0xf0/0x158)
[<c04773b8>] (wait_on_work+0xf0/0x158) from [<c0477d30>] (__cancel_work_timer+0xb8/0x104)
[<c0477d30>] (__cancel_work_timer+0xb8/0x104) from [<c05ca548>] (rga_try_set_reg+0x38/0x270)
[<c05ca548>] (rga_try_set_reg+0x38/0x270) from [<c05cafc4>] (rga_blit+0x3b4/0x3fc)
[<c05cafc4>] (rga_blit+0x3b4/0x3fc) from [<c05cb29c>] (rga_ioctl+0x154/0x374)
[<c05cb29c>] (rga_ioctl+0x154/0x374) from [<c04e3480>] (do_vfs_ioctl+0x500/0x57c)
[<c04e3480>] (do_vfs_ioctl+0x500/0x57c) from [<c04e3530>] (sys_ioctl+0x34/0x54)
[<c04e3530>] (sys_ioctl+0x34/0x54) from [<c0435c80>] (ret_fast_syscall+0x0/0x30)
kworker/1:1     D c086ec20     0  7718      2 0x00000000
[<c086ec20>] (__schedule+0x6d0/0x79c) from [<c086f784>] (__mutex_lock_slowpath+0x158/0x1d8)
[<c086f784>] (__mutex_lock_slowpath+0x158/0x1d8) from [<c086f824>] (mutex_lock+0x20/0x38)
[<c086f824>] (mutex_lock+0x20/0x38) from [<c05ca920>] (rga_power_off_work+0x10/0x24)
[<c05ca920>] (rga_power_off_work+0x10/0x24) from [<c0475d74>] (process_one_work+0x250/0x3ac)
[<c0475d74>] (process_one_work+0x250/0x3ac) from [<c04762b4>] (worker_thread+0x228/0x3e8)
[<c04762b4>] (worker_thread+0x228/0x3e8) from [<c047bc18>] (kthread+0x80/0x88)
[<c047bc18>] (kthread+0x80/0x88) from [<c0436678>] (kernel_thread_exit+0x0/0x8)

Also do not call cancel_delayed_work_sync every time.

12 years agophonepad:fix white lcd problem while awake
lw@rock-chips.com [Fri, 24 Aug 2012 09:26:16 +0000 (17:26 +0800)]
phonepad:fix white lcd problem while awake

12 years agoRK3066B:update board iomux config and add two pmu (wm8326 & tps65910) support
hxy [Fri, 24 Aug 2012 08:31:59 +0000 (16:31 +0800)]
RK3066B:update board iomux config and add two pmu (wm8326 & tps65910) support

12 years agork2928:acodec: add pclk_acodec control.
Zheng Yang [Fri, 24 Aug 2012 07:13:25 +0000 (15:13 +0800)]
rk2928:acodec: add pclk_acodec control.

12 years agocamera rk30: vipmem_virbase is not setted , fix it.
root [Fri, 24 Aug 2012 03:20:34 +0000 (11:20 +0800)]
camera rk30: vipmem_virbase is not setted , fix it.

12 years agork610 :
邱建斌 [Fri, 24 Aug 2012 03:01:58 +0000 (11:01 +0800)]
rk610 :

[   53.538667] PC is at spk_ctrl_fun+0x10/0x34
[   53.542848] LR is at rk610_codec_i2c_shutdown+0x14/0x30
[   53.548070] pc : [<c07bf278>]    lr : [<c07bf4e8>]    psr: a0000013
[   53.548075] sp : e571be58  ip : 00000000  fp : 6bea8c74
[   53.559543] r10: 00000000  r9 : e571a000  r8 : c04f4d84
[   53.564761] r7 : 00000000  r6 : ee9bea2c  r5 : c0c1e714  r4 : 00000000
[   53.571280] r3 : 00000000  r2 : c0ae3710  r1 : c0ae3710  r0 : 00000000
[   53.577801] Flags: NzCv  IRQs on  FIQs on  Mode SVC_32  ISA ARM  Segment user
[   53.584928] Control: 10c53c7d  Table: 8c4a404a  DAC: 00000015

12 years agork2928: to slove the bug ,system halted in the suspend
许盛飞 [Fri, 24 Aug 2012 02:44:36 +0000 (10:44 +0800)]
rk2928: to slove the bug ,system halted in the suspend

12 years agork2928: touchscreen: if A720-A define RK2928_A720_A
kfx [Fri, 24 Aug 2012 01:36:55 +0000 (09:36 +0800)]
rk2928: touchscreen: if A720-A define RK2928_A720_A

12 years agophonepad: add modem input control function.
宋秀杰 [Thu, 23 Aug 2012 13:37:14 +0000 (21:37 +0800)]
phonepad: add modem input control function.

12 years agoi2c: rk2928&rk3066b: add check_idle
kfx [Thu, 23 Aug 2012 10:50:44 +0000 (18:50 +0800)]
i2c: rk2928&rk3066b: add check_idle

12 years agobacklight:support fb_blank operation
lw@rock-chips.com [Thu, 23 Aug 2012 10:34:43 +0000 (18:34 +0800)]
backlight:support fb_blank operation

12 years agocamera rk30: arm_scale algorithm may exceed the bound of width or height ,fix it.
root [Thu, 23 Aug 2012 09:53:31 +0000 (17:53 +0800)]
camera rk30: arm_scale algorithm may exceed the bound of width or height ,fix it.

12 years agork2928: set sdio max clk: 25Mhz
kfx [Thu, 23 Aug 2012 09:49:07 +0000 (17:49 +0800)]
rk2928: set sdio max clk: 25Mhz

12 years ago add ddr code
hcy [Thu, 23 Aug 2012 09:46:29 +0000 (17:46 +0800)]
  add ddr code

12 years agoMT6620: modify the cfg80211 for support AP mode.
xbw [Thu, 23 Aug 2012 08:38:27 +0000 (16:38 +0800)]
MT6620: modify the cfg80211 for support AP mode.

12 years agork2928: add hdmi config
kfx [Thu, 23 Aug 2012 03:23:13 +0000 (11:23 +0800)]
rk2928: add hdmi config

12 years agork2928: i2c: add check_idle && Not select i2c3 if hdmi is enable
kfx [Thu, 23 Aug 2012 03:20:04 +0000 (11:20 +0800)]
rk2928: i2c: add check_idle && Not select i2c3 if hdmi is enable

12 years agoadc: spin_lock->mutex_lock
kfx [Thu, 23 Aug 2012 03:11:46 +0000 (11:11 +0800)]
adc: spin_lock->mutex_lock

12 years agokeyboard: fix some warning
kfx [Thu, 23 Aug 2012 03:03:00 +0000 (11:03 +0800)]
keyboard: fix some warning

12 years agork_serial: make when tx dma is only enable work functionally
hhb [Thu, 23 Aug 2012 02:57:52 +0000 (10:57 +0800)]
rk_serial: make when tx dma is only enable  work functionally

12 years agoMerge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
ddl [Thu, 23 Aug 2012 02:44:41 +0000 (10:44 +0800)]
Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0

12 years agocamera rk30: fix memory obtain error in probe when second cif probe
ddl [Thu, 23 Aug 2012 02:43:51 +0000 (10:43 +0800)]
camera rk30: fix memory obtain error in probe when second cif probe

12 years agork29: remove newton board support
黄涛 [Thu, 23 Aug 2012 02:39:29 +0000 (10:39 +0800)]
rk29: remove newton board support

12 years agork3066b: rename rk31 to rk3066b
黄涛 [Wed, 22 Aug 2012 13:21:56 +0000 (21:21 +0800)]
rk3066b: rename rk31 to rk3066b

12 years agoRevert "cpufreq: introduce hotplug governor"
黄涛 [Wed, 22 Aug 2012 06:42:16 +0000 (14:42 +0800)]
Revert "cpufreq: introduce hotplug governor"

This reverts commit 1b02ab5fd585f88b65379b81874c75f66eec6492.

12 years agoRevert "cpufreq: introduce hotplug governor"
黄涛 [Wed, 22 Aug 2012 06:41:10 +0000 (14:41 +0800)]
Revert "cpufreq: introduce hotplug governor"

This reverts commit 9a2b9393c37a62d21de34461cdcf9fcfccabad71.

12 years agork3066b: rename rk31_fpga_defconfig to rk3066b_fpga_defconfig
黄涛 [Wed, 22 Aug 2012 06:15:49 +0000 (14:15 +0800)]
rk3066b: rename rk31_fpga_defconfig to rk3066b_fpga_defconfig

12 years agork3066b: rename board-rk31-fpga.c to board-rk3066b-fpga.c
黄涛 [Wed, 22 Aug 2012 06:06:57 +0000 (14:06 +0800)]
rk3066b: rename board-rk31-fpga.c to board-rk3066b-fpga.c

12 years agophonepad: add some depop functions.
宋秀杰 [Wed, 22 Aug 2012 11:11:12 +0000 (19:11 +0800)]
phonepad: add some depop functions.

12 years agocamera rk30 :fix bug in rk_camera_set_digit_zoom,must be reenabled after disable.
root [Wed, 22 Aug 2012 10:44:06 +0000 (18:44 +0800)]
camera rk30 :fix bug in rk_camera_set_digit_zoom,must be reenabled after disable.

12 years agocamera rk2928: add user define seriers
root [Wed, 22 Aug 2012 09:37:07 +0000 (17:37 +0800)]
camera rk2928: add user define seriers

12 years agodon't disable usb clock
yangkai [Wed, 22 Aug 2012 09:09:10 +0000 (17:09 +0800)]
don't disable usb clock

12 years agork2928:sdk: set hclk_otg0/1 parent to clk_hclk_usb_peri
chenxing [Wed, 22 Aug 2012 08:17:05 +0000 (16:17 +0800)]
rk2928:sdk: set hclk_otg0/1 parent to clk_hclk_usb_peri

12 years agork3066:fix early suspend DDR frequency from 100Mhz to 120Mhz
cym [Wed, 22 Aug 2012 08:11:12 +0000 (16:11 +0800)]
rk3066:fix early suspend DDR frequency from 100Mhz to 120Mhz

12 years agocamera rk30 : do crop by cif when digital zoom,fix bug of request_mem_region twice.
root [Wed, 22 Aug 2012 07:50:07 +0000 (15:50 +0800)]
camera rk30 : do crop by cif when digital zoom,fix bug of request_mem_region twice.

12 years agoamend size of bmp logo and zoom out display
ywj [Wed, 22 Aug 2012 04:44:13 +0000 (12:44 +0800)]
amend size of bmp logo and zoom out display

12 years agork2928: a720: camera(gc0308) support
kfx [Wed, 22 Aug 2012 04:36:23 +0000 (12:36 +0800)]
rk2928: a720: camera(gc0308) support

12 years ago resume ZQ1CR[0]
hcy [Wed, 22 Aug 2012 02:21:57 +0000 (10:21 +0800)]
  resume ZQ1CR[0]

12 years agork30: phonepad: defconfig: support android 4.1
黄涛 [Tue, 21 Aug 2012 12:17:26 +0000 (20:17 +0800)]
rk30: phonepad: defconfig: support android 4.1

12 years agork2928: a720: defconfig: support android 4.1
黄涛 [Tue, 21 Aug 2012 12:16:22 +0000 (20:16 +0800)]
rk2928: a720: defconfig: support android 4.1

12 years agork2928: sdk: defconfig: support android 4.1
黄涛 [Tue, 21 Aug 2012 12:16:09 +0000 (20:16 +0800)]
rk2928: sdk: defconfig: support android 4.1

12 years agoMerge remote-tracking branch 'origin/develop-3.0-jb' into develop-3.0
黄涛 [Tue, 21 Aug 2012 11:55:23 +0000 (19:55 +0800)]
Merge remote-tracking branch 'origin/develop-3.0-jb' into develop-3.0

12 years agosdmmc: In order to improve the timing,set HOLD_REG to 1,mainly used in RK2928 and...
xbw [Tue, 21 Aug 2012 10:17:08 +0000 (18:17 +0800)]
sdmmc: In order to improve the timing,set HOLD_REG to 1,mainly used in RK2928 and RK31.

12 years agork: add RK_USB_UART config
黄涛 [Tue, 21 Aug 2012 10:06:42 +0000 (18:06 +0800)]
rk: add RK_USB_UART config

12 years agoMerge remote-tracking branch 'aosp/android-3.0' into develop-3.0-jb
黄涛 [Tue, 21 Aug 2012 07:53:18 +0000 (15:53 +0800)]
Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0-jb

Conflicts:
drivers/mmc/core/core.c
drivers/net/wireless/bcm4319/dhd_sdio.c
drivers/net/wireless/bcm4319/include/linux_osl.h
drivers/net/wireless/bcm4319/wl_iw.c
drivers/net/wireless/bcmdhd/dhd.h
drivers/net/wireless/bcmdhd/dhd_cfg80211.c
drivers/net/wireless/bcmdhd/dhd_linux.c
drivers/net/wireless/bcmdhd/include/wlioctl.h
drivers/net/wireless/bcmdhd/wl_cfg80211.c
drivers/net/wireless/bcmdhd/wldev_common.c
drivers/net/wireless/bcmdhd/wldev_common.h

12 years agoadd wakeup_key at vbus disconnect
yangkai [Tue, 21 Aug 2012 06:15:42 +0000 (14:15 +0800)]
add wakeup_key at vbus disconnect

12 years agoMerge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
黄涛 [Tue, 21 Aug 2012 06:14:24 +0000 (14:14 +0800)]
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb

Conflicts:
include/net/cfg80211.h

12 years agoMerge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
yangkai [Tue, 21 Aug 2012 06:13:14 +0000 (14:13 +0800)]
Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0

12 years agoMerge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb
黄涛 [Tue, 21 Aug 2012 05:11:48 +0000 (13:11 +0800)]
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

12 years agoRK2928 USB
wlf [Tue, 21 Aug 2012 04:41:07 +0000 (12:41 +0800)]
RK2928 USB