黄涛 7e0d721539 Revert "PM: Add wake lock api." ...

This reverts commit 046ebf066d.

Conflicts:

	include/linux/wakelock.h

2011-07-30 23:08:42 +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

…

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 "PM: Add wake lock api."

2011-07-30 23:08:42 +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

…

net

Revert "net: socket ioctl to reset connections matching local address"

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

pcmcia

…

rdma

…

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

…

xen

…

Kbuild

…