forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions
linux-uconsole/drivers
History
黄涛 d120da9fa2 Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36 
Conflicts:
	arch/arm/mm/mmu.c
	drivers/input/keyboard/Makefile
	drivers/media/video/gc0309.c
	drivers/misc/Kconfig
	drivers/mmc/core/core.c
	drivers/regulator/Kconfig
	drivers/regulator/Makefile
	drivers/usb/gadget/f_mass_storage.c
	drivers/video/backlight/Makefile
	include/linux/fb.h
	include/linux/mmc/host.h
2011-09-26 14:53:47 +08:00
..
accessibility
acpi Revert "Merge commit 'v2.6.32.9' into android-2.6.32" 2011-07-30 22:24:29 +08:00
adc adc: fix for v2.6.36 2011-08-01 11:20:21 +08:00
amba
ata Revert "Merge commit 'v2.6.32.9' into android-2.6.32" 2011-07-30 22:24:29 +08:00
atm Revert "Merge remote branch 'linux-2.6.32.y/master' into develop" 2011-07-30 16:24:52 +08:00
auxdisplay
base Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36 2011-09-26 14:53:47 +08:00
block Revert "Merge commit 'v2.6.32.9' into android-2.6.32" 2011-07-30 22:24:29 +08:00
bluetooth vflash: fix for v2.6.36 2011-08-01 11:20:38 +08:00
cdrom
char rk_sysrq: fix for v2.6.36 2011-08-01 11:20:53 +08:00
cir add lock between cir and irda 2011-09-02 17:48:00 +08:00
clocksource Revert "Merge remote branch 'linux-2.6.32.y/master' into develop" 2011-07-30 16:24:52 +08:00
cmmb
connector Revert "Merge commit 'v2.6.32.9' into android-2.6.32" 2011-07-30 22:24:29 +08:00
cpufreq Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36 2011-08-01 14:52:01 +08:00
cpuidle Revert "Merge commit 'v2.6.32.9' into android-2.6.32" 2011-07-30 22:24:29 +08:00
crypto Revert "Merge commit 'v2.6.32.9' into android-2.6.32" 2011-07-30 22:24:29 +08:00
dbg dbg: fix for v2.6.36 2011-08-01 11:21:06 +08:00
dca
dio
dma Revert "Merge commit 'v2.6.32.9' into android-2.6.32" 2011-07-30 22:24:29 +08:00
edac Revert "Merge commit 'v2.6.32.9' into android-2.6.32" 2011-07-30 22:24:29 +08:00
eisa
firewire Revert "Merge commit 'v2.6.32.9' into android-2.6.32" 2011-07-30 22:24:29 +08:00
firmware Revert "Merge commit 'v2.6.32.9' into android-2.6.32" 2011-07-30 22:24:29 +08:00
gpio Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36 2011-08-23 14:51:45 +08:00
gpu Revert "Merge commit 'v2.6.32.9' into android-2.6.32" 2011-07-30 22:24:29 +08:00
headset_observe rk29_phone: 2011-08-24 01:44:32 +08:00
hid hid-core: fix for v2.6.36 2011-08-01 11:21:28 +08:00
hwmon Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into develop-2.6.36 2011-08-01 00:04:45 +08:00
i2c recover stop dly because RK29_I2C_STOP_TIMEOUT_COUNT is set 70 2011-08-05 15:59:37 +08:00
ide Revert "Merge commit 'v2.6.32.9' into android-2.6.32" 2011-07-30 22:24:29 +08:00
idle
ieee1394
ieee802154
infiniband Revert "Merge commit 'v2.6.32.9' into android-2.6.32" 2011-07-30 22:24:29 +08:00
input Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36 2011-09-26 14:53:47 +08:00
isdn Revert "Merge remote branch 'linux-2.6.32.y/master' into develop" 2011-07-30 16:24:52 +08:00
leds Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into develop-2.6.36 2011-08-01 00:04:45 +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 Revert "Merge commit 'v2.6.32.9' into android-2.6.32" 2011-07-30 22:24:29 +08:00
media Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36 2011-09-26 14:53:47 +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 wm8994: Delete some not need source 2011-08-22 11:34:54 +08:00
misc Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36 2011-09-26 14:53:47 +08:00
mmc Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36 2011-09-26 14:53:47 +08:00
mtd Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36 2011-08-24 10:22:42 +08:00
net Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36 2011-09-26 14:53:47 +08:00
nubus
of
oprofile Revert "Merge remote branch 'linux-2.6.32.y/master' into develop" 2011-07-30 16:24:52 +08:00
parisc Revert "Merge remote branch 'linux-2.6.32.y/master' into develop" 2011-07-30 16:24:52 +08:00
parport
pci Revert "Merge commit 'v2.6.32.9' into android-2.6.32" 2011-07-30 22:24:29 +08:00
pcmcia Revert "Merge commit 'v2.6.32.9' into android-2.6.32" 2011-07-30 22:24:29 +08:00
platform Revert "Merge commit 'v2.6.32.9' into android-2.6.32" 2011-07-30 22:24:29 +08:00
pnp
power Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36 2011-09-26 14:53:47 +08:00
pps
ps3
rapidio
regulator Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36 2011-09-26 14:53:47 +08:00
rtc Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36 2011-09-26 14:53:47 +08:00
s390 Revert "Merge commit 'v2.6.32.9' into android-2.6.32" 2011-07-30 22:24:29 +08:00
sbus
scsi Revert "Merge commit 'v2.6.32.9' into android-2.6.32" 2011-07-30 22:24:29 +08:00
serial Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36 2011-08-23 14:51:45 +08:00
sfi
sh
smc newton: improve smc drivers 2011-09-13 21:12:50 -07:00
sn
spi Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into develop-2.6.36 2011-08-01 00:04:45 +08:00
ssb Revert "Merge commit 'v2.6.32.9' into android-2.6.32" 2011-07-30 22:24:29 +08:00
staging Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36 2011-09-26 14:53:47 +08:00
switch Revert "switch: switch class and GPIO drivers." 2011-07-30 22:57:46 +08:00
tc
telephony
testcode add some auto test code, maybe useful for someone 2011-06-01 18:47:40 -07:00
thermal
uio
usb Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36 2011-09-26 14:53:47 +08:00
uwb
vhost
video Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36 2011-09-26 14:53:47 +08:00
virtio Revert "Merge remote branch 'linux-2.6.32.y/master' into develop" 2011-07-30 16:24:52 +08:00
vlynq
w1 Revert "w1: don't allow arbitrary users to remove w1 devices" 2011-07-30 23:09:34 +08:00
watchdog Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into develop-2.6.36 2011-08-01 00:04:45 +08:00
xen Revert "Merge commit 'v2.6.32.9' into android-2.6.32" 2011-07-30 22:24:29 +08:00
zorro
Kconfig Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into develop-2.6.36 2011-08-01 00:04:45 +08:00
Makefile Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into develop-2.6.36 2011-08-01 00:04:45 +08:00