黄涛 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

..

acpi

Revert "Merge commit 'v2.6.32.9' into android-2.6.32"

2011-07-30 22:24:29 +08:00

asm-generic

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

crypto

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2009-09-11 09:38:37 -07:00

drm

Revert "Merge commit 'v2.6.32.9' into android-2.6.32"

2011-07-30 22:24:29 +08:00

keys

Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:09:59 +08:00

linux

Revert "uidstat: Adding uid stat driver to collect network statistics."

2011-07-30 22:57:02 +08:00

math-emu

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

media

camera: add support mt9t111 and fix gc0309 display error in a22 project

2011-05-26 10:52:55 +08:00

mtd

Kill jffs2-user.h

2009-06-05 17:31:38 +01:00

net

Revert "Bluetooth: Increase timeout for legacy pairing from 10 seconds to 40 seconds."

2011-07-30 22:41:01 +08:00

pcmcia

PM / yenta: Split resume into early and late parts (rev. 4)

2009-11-03 10:54:58 +01:00

rdma

trivial: fix typo "to to" in multiple files

2009-09-21 15:14:55 +02:00

rxrpc

…

scsi

Revert "Merge commit 'v2.6.32.9' into android-2.6.32"

2011-07-30 22:24:29 +08:00

sound

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

trace

Revert "Merge commit 'v2.6.32.9' into android-2.6.32"

2011-07-30 22:24:29 +08:00

video

davinci-fb-frame-buffer-driver-for-ti-da8xx-omap-l1xx-v4

2009-09-23 07:39:51 -07:00

xen

…

Kbuild

[SCSI] FC Pass Thru support

2009-06-12 14:20:05 -05:00