shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-11 13:27:06 +09:00
Code Issues Packages Projects Releases Wiki Activity
Files
41317a69e5c704b53b45f3b36f49342997cf951e
linux/drivers
History
黄涛 41317a69e5 Revert "temp revert usb serial option change" 
This reverts commit 19d351a97f.

Conflicts:

	drivers/usb/serial/option.c
2011-08-01 01:48:54 +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
rk29: adc: fix error: incompatible type for argument 1 of spin_lock
2011-07-28 15:53:24 +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 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into develop-2.6.36
2011-08-01 00:04:45 +08:00
block
Revert "Merge commit 'v2.6.32.9' into android-2.6.32"
2011-07-30 22:24:29 +08:00
bluetooth
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
cdrom
…
char
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
cir
modify cir send
2011-07-22 15:02:31 +08:00
clocksource
Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"
2011-07-30 16:24:52 +08:00
cmmb
add cmmb io init interface in board file.
2010-10-08 17:49:02 +08:00
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 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into develop-2.6.36
2011-08-01 00:04:45 +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
restore default value to register when reboot
2011-03-21 17:02:51 +08:00
dca
dca: disable dca on IOAT ver.3.0 multiple-IOH platforms
2010-09-17 20:08:21 -07:00
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 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into develop-2.6.36
2011-08-01 00:04: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
rk2818: remove all rk2818 stuff, prepare for 2.6.36
2011-07-28 10:20:10 +08:00
hid
Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36' into develop-2.6.36
2011-08-01 00:17:16 +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
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
ide
Revert "Merge commit 'v2.6.32.9' into android-2.6.32"
2011-07-30 22:24:29 +08:00
idle
intel_idle: do not use the LAPIC timer for ATOM C2
2010-11-22 11:03:03 -08:00
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 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into develop-2.6.36
2011-08-01 00:04:45 +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 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into develop-2.6.36
2011-08-01 00:04:45 +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
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
misc
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
mmc
Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36' into develop-2.6.36
2011-08-01 00:17:16 +08:00
mtd
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
net
Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36' into develop-2.6.36
2011-08-01 00:17:16 +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
PNPACPI: cope with invalid device IDs
2010-12-09 13:33:13 -08:00
power
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
pps
…
ps3
…
rapidio
…
regulator
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
rtc
Revert "temp revert alarm change"
2011-08-01 00:24:19 +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 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into develop-2.6.36
2011-08-01 00:04:45 +08:00
sfi
…
sh
…
smc
newton: add ir remote control driver(cir)
2011-07-03 21:50:11 -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
Revert "temp revert timed_gpio change"
2011-08-01 00:21:23 +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
Revert "temp revert usb serial option change"
2011-08-01 01:48:54 +08:00
uwb
…
vhost
vhost: fix log ctx signalling
2010-09-22 16:21:33 +02:00
video
Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36' into develop-2.6.36
2011-08-01 00:17:16 +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