黄涛 7fe47454f2 Merge tag 'lsk-android-14.04' into develop-3.10 ...

lsk-android 14.04

Conflicts:
	Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
	drivers/pinctrl/pinconf-generic.c
	include/linux/pinctrl/consumer.h
	include/linux/pinctrl/pinconf-generic.h

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

..

acpi

ACPI / hotplug: Fix conflicted PCI bridge notify handlers

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

asm-generic

Merge remote-tracking branch 'origin/upstream/linux-linaro-lsk-v3.10-android' into develop-3.10

2014-02-10 16:23:36 +08:00

clocksource

Revert "clocksource: arch_timer: use virtual counters"

2014-03-28 18:04:43 +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

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

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

keys

…

linux

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

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

math-emu

…

media

isp:camsys_head ver:v0.0.5

2014-03-27 11:26:25 +08:00

memory

…

misc

…

net

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

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

pcmcia

…

ras

…

rdma

…

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.04' into develop-3.10

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

video

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

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

xen

…

Kbuild

…