shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 12:57:06 +09:00
Code Issues Packages Projects Releases Wiki Activity
174,310 Commits 55 Branches 2,486 Tags
f65181d5edaa1f3e514eb0eb8f51c4dd9451baac
Commit Graph

174310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
黄涛
f65181d5ed temp revert timed_gpio change 2011-07-30 22:16:08 +08:00
黄涛
07ba42ba3d Revert "Merge remote branch 'common/android-2.6.32' into develop" 
This reverts commit 5091b83839, reversing
changes made to 0fd331518d.
 2011-07-30 16:26:01 +08:00
黄涛
c69559f6a6 Revert "Merge remote branch 'common/android-2.6.32' into develop" 
This reverts commit c7e039e278, reversing
changes made to d00e5f74ae.
 2011-07-30 16:25:42 +08:00
黄涛
35b9b535e7 Revert "Merge remote branch 'linux-2.6.32.y/master' into develop" 
This reverts commit 6e2688ca84, reversing
changes made to 4b7c9de4de.

Conflicts:

	drivers/gpio/wm831x-gpio.c
	drivers/i2c/busses/Kconfig
	drivers/net/dm9000.c
	drivers/net/wireless/airo.c
	drivers/net/wireless/ath/ar9170/hw.h
	drivers/net/wireless/ath/ar9170/main.c
	drivers/net/wireless/ath/ar9170/usb.c
	drivers/net/wireless/ath/ath5k/ath5k.h
	drivers/net/wireless/ath/ath5k/attach.c
	drivers/net/wireless/ath/ath5k/base.c
	drivers/net/wireless/ath/ath5k/qcu.c
	drivers/net/wireless/ath/ath5k/reset.c
	drivers/net/wireless/ath/ath9k/ath9k.h
	drivers/net/wireless/ath/ath9k/beacon.c
	drivers/net/wireless/ath/ath9k/eeprom.h
	drivers/net/wireless/ath/ath9k/eeprom_def.c
	drivers/net/wireless/ath/ath9k/hw.c
	drivers/net/wireless/ath/ath9k/hw.h
	drivers/net/wireless/ath/ath9k/initvals.h
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/ath/ath9k/pci.c
	drivers/net/wireless/ath/ath9k/phy.h
	drivers/net/wireless/ath/ath9k/rc.c
	drivers/net/wireless/ath/ath9k/xmit.c
	drivers/net/wireless/ath/regd.h
	drivers/net/wireless/b43/Kconfig
	drivers/net/wireless/b43/Makefile
	drivers/net/wireless/b43/b43.h
	drivers/net/wireless/b43/dma.c
	drivers/net/wireless/b43/main.c
	drivers/net/wireless/b43/pio.c
	drivers/net/wireless/b43/pio.h
	drivers/net/wireless/b43/xmit.c
	drivers/net/wireless/b43legacy/main.c
	drivers/net/wireless/hostap/hostap_cs.c
	drivers/net/wireless/hostap/hostap_hw.c
	drivers/net/wireless/hostap/hostap_pci.c
	drivers/net/wireless/hostap/hostap_wlan.h
	drivers/net/wireless/iwlwifi/iwl-3945.c
	drivers/net/wireless/iwlwifi/iwl-4965.c
	drivers/net/wireless/iwlwifi/iwl-5000.c
	drivers/net/wireless/iwlwifi/iwl-agn-rs.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/net/wireless/iwlwifi/iwl-dev.h
	drivers/net/wireless/iwlwifi/iwl-helpers.h
	drivers/net/wireless/iwlwifi/iwl-rx.c
	drivers/net/wireless/iwlwifi/iwl-scan.c
	drivers/net/wireless/iwlwifi/iwl-tx.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c
	drivers/net/wireless/libertas/if_sdio1.c
	drivers/net/wireless/p54/eeprom.c
	drivers/net/wireless/p54/p54pci.c
	drivers/net/wireless/p54/p54usb.c
	drivers/net/wireless/p54/txrx.c
	drivers/net/wireless/rndis_wlan.c
	drivers/net/wireless/rtl818x/rtl8180_dev.c
	drivers/net/wireless/wl12xx/wl1251_debugfs.c
	drivers/net/wireless/wl12xx/wl1251_sdio.c
	drivers/usb/serial/option.c
	net/bluetooth/rfcomm/core.c
 2011-07-30 16:24:52 +08:00
黄涛
8937476fff temp revert msdos change 2011-07-30 16:16:45 +08:00
黄涛
7de15596db Revert "Merge remote branch 'linux-2.6.32.y/master' into develop" 
This reverts commit 84aa38e58d, reversing
changes made to 9505d021e0.
 2011-07-30 16:11:20 +08:00
黄涛
5f1e6e97d5 Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop" 
This reverts commit 7cd3739f32, reversing
changes made to 2748ae2cc2.

Conflicts:

	drivers/usb/core/hub.c
	drivers/usb/serial/option.c
 2011-07-30 16:09:59 +08:00
黄涛
77d6545a14 temp revert mmc change 2011-07-30 16:07:27 +08:00
黄涛
6a3f004727 Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop" 
This reverts commit 2caa51d22a, reversing
changes made to cc88c1f62a.
 2011-07-30 16:01:15 +08:00
黄涛
fae40b5a2c Revert "delete pmem ioctl information" 
This reverts commit 04f2d6f3c1.
 2011-07-30 15:59:46 +08:00
黄涛
8c235653a7 Revert "rk29: call resume_console while dpm_drv_timeout, make debug more easy" 
This reverts commit 1c209c256f.
 2011-07-30 15:59:01 +08:00
黄涛
e041b29247 Revert "ASoC: core: On resume also check the soc device state" 
This reverts commit ecf7611cae.
 2011-07-30 15:56:58 +08:00
黄涛
2448a5573a Revert "clocksource: Provide a generic mult/shift factor calculation" 
This reverts commit cfc80b6829.
 2011-07-30 15:56:49 +08:00
黄涛
ab47eea0bb Revert "Fix rounding in clocks_calc_mult_shift()" 
This reverts commit 2455208a7a.
 2011-07-30 15:56:32 +08:00
黄涛
45c82a64f8 Revert "lib: add support for LZO-compressed kernels" 
This reverts commit 3a3ba0241a.
 2011-07-30 15:55:13 +08:00
黄涛
a69a5e040d Revert "arm: add support for LZO-compressed kernels" 
This reverts commit c418f3acd2.
 2011-07-30 15:54:56 +08:00
黄涛
3f2bbceb46 Revert "timer: Added usleep_range timer" 
This reverts commit 18464b0b75.
 2011-07-30 15:54:41 +08:00
黄涛
57a57994d5 Revert "clockevents: Use u32 for mult and shift factors" 
This reverts commit b7ad2a012a.
 2011-07-30 15:53:44 +08:00
黄涛
b283ec8cc4 temp revert alarm change 2011-07-30 15:41:14 +08:00
黄涛
3349399fd5 temp revert yaffs change 2011-07-30 15:38:09 +08:00
黄涛
aa382e22fb temp revert usb gadget change 2011-07-30 15:28:49 +08:00
黄涛
19d351a97f temp revert usb serial option change 2011-07-30 15:28:06 +08:00
黄涛
755c00cd51 temp revert apanice change 2011-07-30 15:26:22 +08:00
黄涛
28644b6abd temp revert wakelock change 2011-07-30 15:26:02 +08:00
黄涛
954871ce89 net: usb: refactor for 2.6.36 2011-07-30 15:22:16 +08:00
邱建斌
5b2db7bc6c wm8994:fix a bug on calling pop noise 2011-07-30 09:39:18 +08:00
ddl
f529775c67 camera:fix ov5640 flash complite error 2011-07-29 18:08:48 +08:00
ddl
5c0042a06b fb: fix fb rotate bug 2011-07-29 18:08:09 +08:00
clb
0ade95b873 bq27541 board 2011-07-29 17:07:45 +08:00
clb
4f06e65cd8 Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop 2011-07-29 16:46:31 +08:00
clb
8cf48bcc5a add bq27541 2011-07-29 16:46:02 +08:00
黄涛
605d984dce rk29: clock: default codec pll rate set to 297MHz 2011-07-29 16:23:14 +08:00
hhb
8d06500430 rk29phonesdk:touch screen->modify gt818 driver to fit the new touch screen panel 2011-07-29 10:58:24 +08:00
陈金泉
08c3b4ccb9 Use gpio for codec pop noise 2011-07-29 10:06:24 +08:00
黄涛
5d0b87e783 rk29: memcpy_dma: fix section mismatch and initialization from incompatible pointer type warning 2011-07-29 09:56:38 +08:00
黄涛
2b6f4cdec3 rk29: ipp: fix section mismatch warning and include slab.h 2011-07-29 09:53:13 +08:00
黄涛
ab9534f4be rtc: HYM8563: include slab.h, prepare for 2.6.36 2011-07-29 09:53:13 +08:00
黄涛
15ebb68452 rk29: cpufreq: fix section mismatch warning 2011-07-29 09:53:12 +08:00
黄涛
4c190e5e34 rk29: rfkill: sdk: fix section mismatch warning 2011-07-29 09:53:12 +08:00
黄涛
d0410092cb rk29: rfkill: phonepadsdk: fix section mismatch warning 2011-07-29 09:53:12 +08:00
黄涛
31bd2b85a9 rk29: rfkill: phonesdk: fix section mismatch warning 2011-07-29 09:53:12 +08:00
黄涛
c1efd1d33d rk29: rfkill: a22: fix section mismatch warning 2011-07-29 09:53:12 +08:00
lyx
cdad3accf2 newton: updata irda serial driver 
add ioctl get frame length and start send function
 2011-07-28 18:29:52 -07:00
黄涛
5a270af5a5 rk29: ddr_recofig: add ddr_reconfig.c 2011-07-28 19:43:10 +08:00
黄涛
b78fb50bcc rk29: add dynamic DDR reconfiguration support, default disabled 2011-07-28 19:40:37 +08:00
lbt
fba8c05b40 net:wireless:bcm4329: add country code setting for various radio regulator domains. 2011-07-28 18:44:10 +08:00
phc
95f4029300 RK29Smartphone:core voltage changed from 1.25v to 1.30v, when cpu frequecy is 1G Hz 2011-07-28 17:45:06 +08:00
黄涛
5aa311af03 rk29: adc: fix error: incompatible type for argument 1 of spin_lock 2011-07-28 15:53:24 +08:00
ddl
e999437a29 camera: update ov2655 sensor driver 2011-07-28 15:29:05 +08:00
root
e28511b626 WM831X:enable battery FET 2011-07-27 22:55:18 +08:00