黄涛 a2ad9f9801 Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb ...

Conflicts:
	drivers/net/usb/asix.c
	drivers/net/wireless/iwlwifi/iwl-agn-rs.c
	drivers/usb/serial/option.c

2012-07-12 18:46:41 +08:00

..

acpi

ACPI: Store SRAT table revision

2012-01-25 17:24:57 -08:00

asm-generic

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb

2012-07-12 18:46:41 +08:00

crypto

crypto: padlock - Move padlock.h into include/crypto

2011-01-07 14:52:00 +11:00

drm

drm/radeon/kms: add new BTC PCI ids

2012-06-10 00:33:04 +09:00

keys

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

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

linux

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb

2012-07-12 18:46:41 +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 ov3660, this driver is from haixing E170BS

2012-05-16 11:25:36 +08:00

mtd

UBI: fix minor stylistic issues

2011-04-14 11:34:41 +03:00

net

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb

2012-07-12 18:46:41 +08:00

pcmcia

pcmcia: Make declaration and uses of struct pcmcia_device_id const

2011-05-06 07:46:15 +02:00

rdma

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

2011-05-26 12:13:57 -07:00

rxrpc

Fix common misspellings

2011-03-31 11:26:23 -03:00

scsi

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

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

sound

add incalling cannot suspend interface

2012-02-11 16:18:12 +08:00

target

target: Set additional sense length field in sense data

2012-01-25 17:25:00 -08:00

trace

cpufreq: interactive: fixup trace of string params

2012-05-11 11:07:46 -07:00

video

OMAPDSS: HDMI: PHY burnout fix

2012-03-12 10:32:59 -07:00

xen

xen/xenbus: Reject replies with payload > XENSTORE_PAYLOAD_MAX.

2012-01-25 17:24:41 -08:00

Kbuild

…