shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-04-18 03:20:44 +09:00
Code Issues Packages Projects Releases Wiki Activity
Files
ea32bd9ebc4a04178c8ba357ad2178de244b2a96
linux/drivers
History
黄涛 ea32bd9ebc Revert "uidstat: Adding uid stat driver to collect network statistics." 
This reverts commit ab6c8fc0de.

Conflicts:

	drivers/misc/Kconfig
2011-07-30 22:57:02 +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
Merge branches 'arm', 'at91', 'bcmring', 'ep93xx', 'mach-types', 'misc' and 'w90x900' into devel
2009-09-12 12:01:34 +01:00
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
Revert "drivers: power: Add watchdog timer to catch drivers which lockup during suspend."
2011-07-30 22:31:35 +08:00
block
Revert "Merge commit 'v2.6.32.9' into android-2.6.32"
2011-07-30 22:24:29 +08:00
bluetooth
Revert "Merge commit 'v2.6.32.9' into android-2.6.32"
2011-07-30 22:24:29 +08:00
cdrom
sysctl: remove "struct file *" argument of ->proc_handler
2009-09-24 07:21:04 -07:00
char
Revert "Merge commit 'v2.6.32.9' into android-2.6.32"
2011-07-30 22:24:29 +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
Revert "cpufreq: ondemand: Don't synchronize sample rate unless mulitple cpus present"
2011-07-30 22:27:06 +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: module load should not be an error message
2009-09-13 10:27:04 -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
Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"
2011-07-30 16:24:52 +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
Revert "Merge commit 'v2.6.32.9' into android-2.6.32"
2011-07-30 22:24:29 +08:00
hwmon
Revert "Merge commit 'v2.6.32.9' into android-2.6.32"
2011-07-30 22:24:29 +08:00
i2c
Revert "pca963x: Phillips PCA963X 4-bit i2c led driver"
2011-07-30 22:27:01 +08:00
ide
Revert "Merge commit 'v2.6.32.9' into android-2.6.32"
2011-07-30 22:24:29 +08:00
idle
ioat: switch watchdog and reset handler from workqueue to timer
2009-09-08 17:30:24 -07:00
ieee1394
headers: remove sched.h from interrupt.h
2009-10-11 11:20:58 -07:00
ieee802154
ieee802154: dont leak skbs in ieee802154_fake_xmit()
2009-11-19 13:16:21 -08:00
infiniband
Revert "Merge commit 'v2.6.32.9' into android-2.6.32"
2011-07-30 22:24:29 +08:00
input
Revert "Input: Generic GPIO Input device."
2011-07-30 22:56:11 +08:00
isdn
Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"
2011-07-30 16:24:52 +08:00
leds
Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"
2011-07-30 16:24:52 +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
Revert "Merge commit 'v2.6.32.9' into android-2.6.32"
2011-07-30 22:24:29 +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
Revert "Merge commit 'v2.6.32.9' into android-2.6.32"
2011-07-30 22:24:29 +08:00
misc
Revert "uidstat: Adding uid stat driver to collect network statistics."
2011-07-30 22:57:02 +08:00
mmc
Revert "mmc: sd: Add new CONFIG_MMC_PARANOID_SD_INIT for enabling retries during SD detection"
2011-07-30 22:53:30 +08:00
mtd
Revert "mtd: nand: Add naieve panic_write support for generic nand devices."
2011-07-30 22:30:42 +08:00
net
Revert "net: add PPP on L2TP Access Concentrator (PPPoLAC) driver."
2011-07-30 22:45:00 +08:00
nubus
…
of
of: Remove nested function
2009-10-15 09:58:27 -06:00
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
sysctl: remove "struct file *" argument of ->proc_handler
2009-09-24 07:21:04 -07:00
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
ACPI: remove acpi_device.flags.hardware_id
2009-09-25 15:09:48 -04:00
power
Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"
2011-07-30 16:24:52 +08:00
pps
pps: events reporting fix up
2009-11-12 07:26:01 -08:00
ps3
powerpc/ps3: Workaround for flash memory I/O error
2009-09-11 11:28:00 +10:00
rapidio
…
regulator
Revert "Merge commit 'v2.6.32.9' into android-2.6.32"
2011-07-30 22:24:29 +08:00
rtc
Revert "Merge commit 'v2.6.32.9' into android-2.6.32"
2011-07-30 22:24:29 +08:00
s390
Revert "Merge commit 'v2.6.32.9' into android-2.6.32"
2011-07-30 22:24:29 +08:00
sbus
const: make block_device_operations const
2009-09-22 07:17:25 -07:00
scsi
Revert "Merge commit 'v2.6.32.9' into android-2.6.32"
2011-07-30 22:24:29 +08:00
serial
Revert "serial_core: Add wake_peer uart operation which is called before starting UART TX. The idea here is to provide a mechanism where we can wakeup our peer before sending data."
2011-07-30 22:41:09 +08:00
sfi
SFI: remove __init from sfi_verify_table
2009-10-03 01:16:12 -04:00
sh
sh: Fix up simplified multi-evt handling under sparseirq.
2009-08-31 15:15:33 +09:00
smc
newton: add ir remote control driver(cir)
2011-07-03 21:50:11 -07:00
sn
…
spi
rk2818: remove all rk2818 stuff, prepare for 2.6.36
2011-07-28 10:20:10 +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 "ramconsole/apanic: Ensure ramconsole does not get cluttered by apanic threads"
2011-07-30 22:27:15 +08:00
switch
switch: switch class and GPIO drivers.
2010-02-03 21:27:14 -08:00
tc
…
telephony
…
testcode
add some auto test code, maybe useful for someone
2011-06-01 18:47:40 -07:00
thermal
acpi: thermal: Add EOL to the trip_point_N_type strings
2009-11-05 17:33:24 -05:00
uio
uio: pm_runtime_disable is needed if failed
2009-11-13 11:36:00 +09:00
usb
Revert "android_usb: Composite USB gadget driver for android."
2011-07-30 22:48:57 +08:00
uwb
headers: remove sched.h from interrupt.h
2009-10-11 11:20:58 -07:00
video
Revert "Merge commit 'v2.6.32.9' into android-2.6.32"
2011-07-30 22:24:29 +08:00
virtio
Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"
2011-07-30 16:24:52 +08:00
vlynq
drivers/vlynq/vlynq.c: fix resource size off by 1 error
2009-09-24 07:21:05 -07:00
w1
Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"
2011-07-30 16:24:52 +08:00
watchdog
Revert "Merge commit 'v2.6.32.9' into android-2.6.32"
2011-07-30 22:24:29 +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
rk2818: remove all rk2818 stuff, prepare for 2.6.36
2011-07-28 10:20:10 +08:00
Makefile
Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"
2011-07-30 16:24:52 +08:00