黄涛 4b19ba3477 Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next ...

Conflicts:
	drivers/staging/android/ion/ion.c
	include/linux/rockchip/sysmmu.h

2014-08-04 16:52:07 +08:00

..

acpi

ACPI / hotplug: Fix conflicted PCI bridge notify handlers

2013-12-04 10:57:04 -08:00

asm-generic

Merge tag 'lsk-android-14.05' into develop-3.10

2014-06-12 21:04:26 +08:00

clocksource

Merge tag 'lsk-android-14.05' into develop-3.10

2014-06-12 21:04:26 +08:00

crypto

crypto: scatterwalk - Use sg_chain_ptr on chain entries

2013-12-11 22:36:29 -08:00

drm

rk3288 chromium: drm grafic fb support for x11 mali gpu

2014-03-26 12:41:08 +08:00

dt-bindings

pinctrl:add pinctrl dts for rk312x again

2014-07-24 11:19:55 +08:00

keys

…

linux

Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next

2014-08-04 16:52:07 +08:00

math-emu

…

media

camsys_drv : v0.0x12.0 ,camsys_head : v0.0x8.0

2014-07-31 18:01:30 +08:00

memory

…

misc

…

net

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

2014-04-15 09:59:04 +08:00

pcmcia

pcmcia/ds.h: introduce helper for pcmcia_driver module boilerplate

2013-03-15 12:26:03 -07:00

ras

edac: add support for error type "Info"

2013-02-21 14:16:27 -03:00

rdma

IB/core: Add "type 2" memory windows support

2013-02-21 11:51:45 -08:00

rxrpc

…

scsi

ore: Fix wrong math in allocation of per device BIO

2014-02-13 13:48:00 -08:00

sound

ALSA: memalloc.h - fix wrong truncation of dma_addr_t

2013-12-20 07:45:06 -08:00

target

iscsi/iser-target: Fix isert_conn->state hung shutdown issues

2014-03-23 21:38:21 -07:00

trace

Merge tag 'lsk-android-14.04' into develop-3.10

2014-04-24 19:04:10 +08:00

uapi

Merge tag 'lsk-android-14.05' into develop-3.10

2014-06-12 21:04:26 +08:00

video

Merge tag 'lsk-android-14.05' into develop-3.10

2014-06-12 21:04:26 +08:00

xen

rk: revert 20f3d0b+v3.0.66 to v3.0

2013-11-08 21:34:05 +08:00

Kbuild

UAPI: remove empty Kbuild files

2013-04-30 17:04:09 -07:00